hwmon: (ams) Fix locking issues

[linux-2.6-omap-h63xx.git] / drivers / input / serio / i8042.h

diff --git a/drivers/input/serio/i8042.h b/drivers/input/serio/i8042.h
index af526ab9ec04205239f5d580aec7ce30323dc9e2..cbc1beb66574d51d8e15f70845b78631e8349e4c 100644 (file)
--- a/drivers/input/serio/i8042.h
+++ b/drivers/input/serio/i8042.h
@@ -16,8 +16,10 @@
 
 #if defined(CONFIG_MACH_JAZZ)
 #include "i8042-jazzio.h"
-#elif defined(CONFIG_SGI_IP22)
+#elif defined(CONFIG_SGI_HAS_I8042)
 #include "i8042-ip22io.h"
+#elif defined(CONFIG_SNI_RM)
+#include "i8042-snirm.h"
 #elif defined(CONFIG_PPC)
 #include "i8042-ppcio.h"
 #elif defined(CONFIG_SPARC)
@@ -36,15 +38,6 @@
 
 #define I8042_CTL_TIMEOUT      10000
 
-/*
- * When the device isn't opened and it's interrupts aren't used, we poll it at
- * regular intervals to see if any characters arrived. If yes, we can start
- * probing for any mouse / keyboard connected. This is the period of the
- * polling.
- */
-
-#define I8042_POLL_PERIOD      HZ/20
-
 /*
  * Status register bits.
  */
@@ -69,28 +62,6 @@
 #define I8042_CTR_AUXDIS       0x20
 #define I8042_CTR_XLATE                0x40
 
-/*
- * Commands.
- */
-
-#define I8042_CMD_CTL_RCTR     0x0120
-#define I8042_CMD_CTL_WCTR     0x1060
-#define I8042_CMD_CTL_TEST     0x01aa
-
-#define I8042_CMD_KBD_DISABLE  0x00ad
-#define I8042_CMD_KBD_ENABLE   0x00ae
-#define I8042_CMD_KBD_TEST     0x01ab
-#define I8042_CMD_KBD_LOOP     0x11d2
-
-#define I8042_CMD_AUX_DISABLE  0x00a7
-#define I8042_CMD_AUX_ENABLE   0x00a8
-#define I8042_CMD_AUX_TEST     0x01a9
-#define I8042_CMD_AUX_SEND     0x10d4
-#define I8042_CMD_AUX_LOOP     0x11d3
-
-#define I8042_CMD_MUX_PFX      0x0090
-#define I8042_CMD_MUX_SEND     0x1090
-
 /*
  * Return codes.
  */