Merge branch 'next' into for-linus

[karo-tx-linux.git] / drivers / input / serio / Kconfig

diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig
index aebfe3ecb9451638b21714949caff6c9c381fbf8..94c17c28d2683e8b76582e711f0a2221534fbf14 100644 (file)
--- a/drivers/input/serio/Kconfig
+++ b/drivers/input/serio/Kconfig
@@ -205,6 +205,7 @@ config SERIO_XILINX_XPS_PS2
 
 config SERIO_ALTERA_PS2
        tristate "Altera UP PS/2 controller"
+       depends on HAS_IOMEM
        help
          Say Y here if you have Altera University Program PS/2 ports.
 
@@ -255,4 +256,14 @@ config SERIO_APBPS2
          To compile this driver as a module, choose M here: the module will
          be called apbps2.
 
+config SERIO_OLPC_APSP
+       tristate "OLPC AP-SP input support"
+       depends on OF
+       help
+         Say Y here if you want support for the keyboard and touchpad included
+         in the OLPC XO-1.75 and XO-4 laptops.
+
+         To compile this driver as a module, choose M here: the module will
+         be called olpc_apsp.
+
 endif