aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFeng Tang <feng.tang@intel.com>2010-07-05 23:03:21 +0800
committerH. Peter Anvin <hpa@linux.intel.com>2010-07-07 17:05:07 -0700
commitc9d46f63f8e89fd70f97b83fdc4e5d2e37d92aeb (patch)
treef4a633ea3f534bfc3b8eb8cd1438119b4a2ff169
parent44631ac64d06d2f7ce006c2a6f2c8e003a9c6ace (diff)
downloadkernel_samsung_crespo-c9d46f63f8e89fd70f97b83fdc4e5d2e37d92aeb.zip
kernel_samsung_crespo-c9d46f63f8e89fd70f97b83fdc4e5d2e37d92aeb.tar.gz
kernel_samsung_crespo-c9d46f63f8e89fd70f97b83fdc4e5d2e37d92aeb.tar.bz2
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>
-rw-r--r--drivers/input/keyboard/Kconfig2
-rw-r--r--drivers/input/serio/Kconfig2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 917eec3..3525f53 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -69,7 +69,7 @@ config KEYBOARD_ATARI
module will be called atakbd.
config KEYBOARD_ATKBD
- tristate "AT keyboard" if EMBEDDED || !X86 || X86_MRST
+ tristate "AT keyboard" if EMBEDDED || !X86
default y
select SERIO
select SERIO_LIBPS2
diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig
index 256b9e9..3bfe8fa 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,