Merge tag 'v3.9-rc3' into next

[sfrench/cifs-2.6.git] / drivers / input / serio / Kconfig

diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig
index 3ec5ef2dd443145ae70588043c1705a632d587cd..aebfe3ecb9451638b21714949caff6c9c381fbf8 100644 (file)
--- a/drivers/input/serio/Kconfig
+++ b/drivers/input/serio/Kconfig
@@ -245,4 +245,14 @@ config SERIO_ARC_PS2
          To compile this driver as a module, choose M here; the module
          will be called arc_ps2.
 
+config SERIO_APBPS2
+       tristate "GRLIB APBPS2 PS/2 keyboard/mouse controller"
+       depends on OF
+       help
+         Say Y here if you want support for GRLIB APBPS2 peripherals used
+         to connect to PS/2 keyboard and/or mouse.
+
+         To compile this driver as a module, choose M here: the module will
+         be called apbps2.
+
 endif