summaryrefslogtreecommitdiff
path: root/drivers/input/serio/Kconfig
diff options
context:
space:
mode:
authorFeng Tang <feng.tang@intel.com>2010-07-05 19:03:21 +0400
committerH. Peter Anvin <hpa@linux.intel.com>2010-07-08 04:05:07 +0400
commitc9d46f63f8e89fd70f97b83fdc4e5d2e37d92aeb (patch)
treef4a633ea3f534bfc3b8eb8cd1438119b4a2ff169 /drivers/input/serio/Kconfig
parent44631ac64d06d2f7ce006c2a6f2c8e003a9c6ace (diff)
downloadlinux-c9d46f63f8e89fd70f97b83fdc4e5d2e37d92aeb.tar.xz
Revert "Input: fixup X86_MRST selects"
This reverts commit 0b28bac5aef7bd1ab213723df031e61db9ff151a. After adding x86_platform's detection for i8042 controller, we don't need the force dependency on !X86_MRST any more Cc: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Feng Tang <feng.tang@intel.com> LKML-Reference: <1278342202-10973-5-git-send-email-feng.tang@intel.com> Acked-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'drivers/input/serio/Kconfig')
-rw-r--r--drivers/input/serio/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig
index 256b9e9394dc..3bfe8fafc6ad 100644
--- a/drivers/input/serio/Kconfig
+++ b/drivers/input/serio/Kconfig
@@ -22,7 +22,7 @@ config SERIO_I8042
tristate "i8042 PC Keyboard controller" if EMBEDDED || !X86
default y
depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && \
- (!SUPERH || SH_CAYMAN) && !M68K && !BLACKFIN && !X86_MRST
+ (!SUPERH || SH_CAYMAN) && !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,