summaryrefslogtreecommitdiff
path: root/drivers/input/serio/Kconfig
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2011-01-13 02:06:06 +0300
committerLen Brown <len.brown@intel.com>2011-01-13 02:06:06 +0300
commit56dbed129df3fdd4caf9018b6e7599ee258a5420 (patch)
treeb902491aef3a99efe0d9d49edd0f6e414dba654f /drivers/input/serio/Kconfig
parent2a2d31c8dc6f1ebcf5eab1d93a0cb0fb4ed57c7c (diff)
parentf878133bf022717b880d0e0995b8f91436fd605c (diff)
downloadlinux-56dbed129df3fdd4caf9018b6e7599ee258a5420.tar.xz
Merge branch 'linus' into idle-test
Diffstat (limited to 'drivers/input/serio/Kconfig')
-rw-r--r--drivers/input/serio/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig
index 6256233d2bfb..bcb1fdedb595 100644
--- a/drivers/input/serio/Kconfig
+++ b/drivers/input/serio/Kconfig
@@ -214,7 +214,6 @@ config SERIO_AMS_DELTA
tristate "Amstrad Delta (E3) mailboard support"
depends on MACH_AMS_DELTA
default y
- select AMS_DELTA_FIQ
---help---
Say Y here if you have an E3 and want to use its mailboard,
or any standard AT keyboard connected to the mailboard port.