Don't ask about SERIO selection - let Kconfig select it

automatically as needed.

drivers/input/joystick/Kconfig

@@ -155,7 +155,8 @@ source "drivers/input/joystick/iforce/Kconfig"
 
 config JOYSTICK_WARRIOR
 	tristate "Logitech WingMan Warrior joystick"
-	depends on INPUT && INPUT_JOYSTICK && SERIO
+	depends on INPUT && INPUT_JOYSTICK
+	select SERIO
 	help
 	  Say Y here if you have a Logitech WingMan Warrior joystick connected
 	  to your computer's serial port. 
@@ -167,7 +168,8 @@ config JOYSTICK_WARRIOR
 
 config JOYSTICK_MAGELLAN
 	tristate "LogiCad3d Magellan/SpaceMouse 6dof controllers"
-	depends on INPUT && INPUT_JOYSTICK && SERIO
+	depends on INPUT && INPUT_JOYSTICK
+	select SERIO
 	help
 	  Say Y here if you have a Magellan or Space Mouse 6DOF controller
 	  connected to your computer's serial port.
@@ -179,7 +181,8 @@ config JOYSTICK_MAGELLAN
 
 config JOYSTICK_SPACEORB
 	tristate "SpaceTec SpaceOrb/Avenger 6dof controllers"
-	depends on INPUT && INPUT_JOYSTICK && SERIO
+	depends on INPUT && INPUT_JOYSTICK
+	select SERIO
 	help
 	  Say Y here if you have a SpaceOrb 360 or SpaceBall Avenger 6DOF
 	  controller connected to your computer's serial port.
@@ -191,7 +194,8 @@ config JOYSTICK_SPACEORB
 
 config JOYSTICK_SPACEBALL
 	tristate "SpaceTec SpaceBall 6dof controllers"
-	depends on INPUT && INPUT_JOYSTICK && SERIO
+	depends on INPUT && INPUT_JOYSTICK
+	select SERIO
 	help
 	  Say Y here if you have a SpaceTec SpaceBall 2003/3003/4000 FLX
 	  controller connected to your computer's serial port. For the
@@ -204,7 +208,8 @@ config JOYSTICK_SPACEBALL
 
 config JOYSTICK_STINGER
 	tristate "Gravis Stinger gamepad"
-	depends on INPUT && INPUT_JOYSTICK && SERIO
+	depends on INPUT && INPUT_JOYSTICK
+	select SERIO
 	help
 	  Say Y here if you have a Gravis Stinger connected to one of your
 	  serial ports.
@@ -216,7 +221,8 @@ config JOYSTICK_STINGER
 
 config JOYSTICK_TWIDDLER
 	tristate "Twiddler as a joystick"
-	depends on INPUT && INPUT_JOYSTICK && SERIO
+	depends on INPUT && INPUT_JOYSTICK
+	select SERIO
 	help
 	  Say Y here if you have a Handykey Twiddler connected to your
 	  computer's serial port and want to use it as a joystick.

drivers/input/keyboard/Kconfig

@@ -13,9 +13,9 @@ config INPUT_KEYBOARD
 
 config KEYBOARD_ATKBD
 	tristate "AT keyboard support" if EMBEDDED || !X86 
-	default y if INPUT=y && INPUT_KEYBOARD=y && SERIO=y
-	default m
-	depends on INPUT && INPUT_KEYBOARD && SERIO
+	default y
+	depends on INPUT && INPUT_KEYBOARD
+	select SERIO_I8042
 	help
 	  Say Y here if you want to use a standard AT or PS/2 keyboard. Usually
 	  you'll need this, unless you have a different type keyboard (USB, ADB
@@ -31,7 +31,8 @@ config KEYBOARD_ATKBD
 
 config KEYBOARD_SUNKBD
 	tristate "Sun Type 4 and Type 5 keyboard support"
-	depends on INPUT && INPUT_KEYBOARD && SERIO
+	depends on INPUT && INPUT_KEYBOARD
+	select SERIO
 	help
 	  Say Y here if you want to use a Sun Type 4 or Type 5 keyboard,
 	  connected either to the Sun keyboard connector or to an serial
@@ -44,7 +45,8 @@ config KEYBOARD_SUNKBD
 
 config KEYBOARD_XTKBD
 	tristate "XT Keyboard support"
-	depends on INPUT && INPUT_KEYBOARD && SERIO
+	depends on INPUT && INPUT_KEYBOARD
+	select SERIO
 	help
 	  Say Y here if you want to use the old IBM PC/XT keyboard (or
 	  compatible) on your system. This is only possible with a
@@ -58,7 +60,8 @@ config KEYBOARD_XTKBD
 
 config KEYBOARD_NEWTON
 	tristate "Newton keyboard"
-	depends on INPUT && INPUT_KEYBOARD && SERIO
+	depends on INPUT && INPUT_KEYBOARD
+	select SERIO
 	help
 	  Say Y here if you have a Newton keyboard on a serial port.
 
@@ -93,7 +96,8 @@ config KEYBOARD_AMIGA
 
 config KEYBOARD_98KBD
 	tristate "NEC PC-9800 Keyboard support"
-	depends on X86_PC9800 && INPUT && INPUT_KEYBOARD && SERIO
+	depends on X86_PC9800 && INPUT && INPUT_KEYBOARD
+	select SERIO
 	help
 	  Say Y here if you want to use the NEC PC-9801/PC-9821 keyboard (or
 	  compatible) on your system. 

drivers/input/mouse/Kconfig

@@ -14,7 +14,8 @@ config INPUT_MOUSE
 config MOUSE_PS2
 	tristate "PS/2 mouse"
 	default y
-	depends on INPUT && INPUT_MOUSE && SERIO
+	depends on INPUT && INPUT_MOUSE
+	select SERIO_I8042
 	---help---
 	  Say Y here if you have a PS/2 mouse connected to your system. This
 	  includes the standard 2 or 3-button PS/2 mouse, as well as PS/2
@@ -31,7 +32,7 @@ config MOUSE_PS2
 config MOUSE_PS2_SYNAPTICS
 	bool "Synaptics TouchPad"
 	default n
-	depends on INPUT && INPUT_MOUSE && SERIO && MOUSE_PS2
+	depends on INPUT && INPUT_MOUSE && MOUSE_PS2
 	---help---
 	  Say Y here if you have a Synaptics TouchPad connected to your system.
 	  This touchpad is found on many modern laptop computers.
@@ -46,7 +47,8 @@ config MOUSE_PS2_SYNAPTICS
 
 config MOUSE_SERIAL
 	tristate "Serial mouse"
-	depends on INPUT && INPUT_MOUSE && SERIO
+	depends on INPUT && INPUT_MOUSE
+	select SERIO
 	---help---
 	  Say Y here if you have a serial (RS-232, COM port) mouse connected
 	  to your system. This includes Sun, MouseSystems, Microsoft,

drivers/input/serio/Kconfig

@@ -2,7 +2,7 @@
 # Input core configuration
 #
 config SERIO
-	tristate "Serial i/o support (needed for keyboard and mouse)"
+	tristate "Serial i/o support" if EMBEDDED || !X86
 	default y
 	---help---
 	  Say Yes here if you have any input device that uses serial I/O to
@@ -21,7 +21,7 @@ config SERIO
 config SERIO_I8042
 	tristate "i8042 PC Keyboard controller" if EMBEDDED || !X86
 	default y
-	depends on SERIO
+	select SERIO
 	---help---
 	  i8042 is the chip over which the standard AT keyboard and PS/2
 	  mouse are connected to the computer. If you use these devices,

drivers/input/touchscreen/Kconfig

@@ -12,7 +12,8 @@ config INPUT_TOUCHSCREEN
 
 config TOUCHSCREEN_BITSY
 	tristate "Compaq iPAQ H3600 (Bitsy) touchscreen input driver"
-	depends on SA1100_BITSY && INPUT && INPUT_TOUCHSCREEN && SERIO
+	depends on SA1100_BITSY && INPUT && INPUT_TOUCHSCREEN
+	select SERIO
 	help
 	  Say Y here if you have the h3600 (Bitsy) touchscreen.
 
@@ -25,7 +26,8 @@ config TOUCHSCREEN_BITSY
 
 config TOUCHSCREEN_GUNZE
 	tristate "Gunze AHL-51S touchscreen"
-	depends on INPUT && INPUT_TOUCHSCREEN && SERIO
+	depends on INPUT && INPUT_TOUCHSCREEN
+	select SERIO
 	help
 	  Say Y here if you have the Gunze AHL-51 touchscreen connected to
 	  your system.