Remove user configurable I8042_BASE/I8042_IRQs.

Archs can define i8042 access in i8042-io*.h

diff --git a/drivers/input/serio/Config.in b/drivers/input/serio/Config.in
index cedd53e2d415aabbf953daf61f3e635803c75212..919740e1fc0d2b06ae36f8c0442236bb8f83467e 100644 (file)
--- a/drivers/input/serio/Config.in
+++ b/drivers/input/serio/Config.in
@@ -5,11 +5,6 @@
 tristate 'Serial i/o support' CONFIG_SERIO
 
 dep_tristate '  i8042 PC Keyboard controller' CONFIG_SERIO_I8042 $CONFIG_SERIO
-if [ "$CONFIG_SERIO_I8042" != "n" ]; then
-   hex '    Register Base Address' CONFIG_I8042_REG_BASE 60
-   int '    PS/2 Keyboard IRQ' CONFIG_I8042_KBD_IRQ 1
-   int '    PS/2 AUX IRQ' CONFIG_I8042_AUX_IRQ 12
-fi
 dep_tristate '  Serial port line discipline' CONFIG_SERIO_SERPORT $CONFIG_SERIO 
 dep_tristate '  ct82c710 Aux port controller' CONFIG_SERIO_CT82C710 $CONFIG_SERIO
 if [ "$CONFIG_Q40" = "y" ]; then

diff --git a/drivers/input/serio/i8042-io.h b/drivers/input/serio/i8042-io.h
index b6b52a8e6c5fcda7509d53b20d511e213524061d..c1e8512e0723152bdfd8044ad6cfa243bf23b956 100644 (file)
--- a/drivers/input/serio/i8042-io.h
+++ b/drivers/input/serio/i8042-io.h
@@ -18,17 +18,21 @@
  * IRQs.
  */
 
-#define I8042_KBD_IRQ CONFIG_I8042_KBD_IRQ 
-#define I8042_AUX_IRQ CONFIG_I8042_AUX_IRQ
+#ifdef __alpha__
+#define I8042_KBD_IRQ  1
+#define I8042_AUX_IRQ  (RTC_PORT(0) == 0x170 ? 9 : 12) /* Jensen is special */
+#else
+#define I8042_KBD_IRQ  1
+#define I8042_AUX_IRQ  12
+#endif
 
 /*
  * Register numbers.
  */
 
-#define I8042_COMMAND_REG      CONFIG_I8042_REG_BASE + 4       
-#define I8042_STATUS_REG       CONFIG_I8042_REG_BASE + 4       
-#define I8042_DATA_REG         CONFIG_I8042_REG_BASE   
-
+#define I8042_COMMAND_REG      0x64    
+#define I8042_STATUS_REG       0x64    
+#define I8042_DATA_REG         0x60
 
 static inline int i8042_read_data(void)
 {