Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

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

diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig
index 98acf170252cfa351d67294d20dc960210a1e207..ec4b6610f730ea7d18a1e5e924201be4ac0a1123 100644 (file)
--- a/drivers/input/serio/Kconfig
+++ b/drivers/input/serio/Kconfig
@@ -21,7 +21,7 @@ if SERIO
 config SERIO_I8042
        tristate "i8042 PC Keyboard controller" if EMBEDDED || !X86
        default y
-       depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && !M68K
+       depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && !M68K && !BLACKFIN
        ---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,
@@ -88,6 +88,16 @@ config SERIO_RPCKBD
          To compile this driver as a module, choose M here: the
          module will be called rpckbd.
 
+config SERIO_AT32PSIF
+       tristate "AVR32 PSIF PS/2 keyboard and mouse controller"
+       depends on AVR32
+       help
+         Say Y here if you want to use the PSIF peripheral on AVR32 devices
+         and connect a PS/2 keyboard and/or mouse to it.
+
+         To compile this driver as a module, choose M here: the module will
+         be called at32psif.
+
 config SERIO_AMBAKMI
        tristate "AMBA KMI keyboard controller"
        depends on ARM_AMBA
@@ -112,12 +122,12 @@ config SERIO_GSCPS2
 
 config HP_SDC
        tristate "HP System Device Controller i8042 Support"
-       depends on GSC && SERIO
+       depends on (GSC || HP300) && SERIO
        default y
        ---help---
-         This option enables supports for the the "System Device
+         This option enables support for the "System Device
          Controller", an i8042 carrying microcode to manage a
-         few miscellanous devices on some Hewlett Packard systems.
+         few miscellaneous devices on some Hewlett Packard systems.
          The SDC itself contains a 10ms resolution timer/clock capable
          of delivering interrupts on a periodic and one-shot basis.
          The SDC may also be connected to a battery-backed real-time