vserver 1.9.5.x5

[linux-2.6.git] / drivers / input / serio / Kconfig

diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig
index db1a8ce..6826783 100644 (file)
--- a/drivers/input/serio/Kconfig
+++ b/drivers/input/serio/Kconfig
@@ -20,7 +20,7 @@ config SERIO_I8042
        tristate "i8042 PC Keyboard controller" if EMBEDDED || !X86
        default y
        select SERIO
-       depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST)
+       depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && !M68K
        ---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,
@@ -131,6 +131,16 @@ config SERIO_MACEPS2
          To compile this driver as a module, choose M here: the
          module will be called maceps2.
 
+config SERIO_LIBPS2
+       tristate "PS/2 driver library" if EMBEDDED
+       depends on SERIO
+       help
+         Say Y here if you are using a driver for device connected
+         to a PS/2 port, such as PS/2 mouse or standard AT keyboard.
+
+         To compile this driver as a module, choose M here: the
+         module will be called libps2.
+
 config SERIO_RAW
        tristate "Raw access to serio ports"
        depends on SERIO