Commit c9d46f63 authored by Feng Tang's avatar Feng Tang Committed by H. Peter Anvin

Revert "Input: fixup X86_MRST selects"

This reverts commit 0b28bac5.

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: default avatarFeng Tang <feng.tang@intel.com>
LKML-Reference: <1278342202-10973-5-git-send-email-feng.tang@intel.com>
Acked-by: default avatarDmitry Torokhov <dtor@mail.ru>
Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 44631ac6
...@@ -69,7 +69,7 @@ config KEYBOARD_ATARI ...@@ -69,7 +69,7 @@ config KEYBOARD_ATARI
module will be called atakbd. module will be called atakbd.
config KEYBOARD_ATKBD config KEYBOARD_ATKBD
tristate "AT keyboard" if EMBEDDED || !X86 || X86_MRST tristate "AT keyboard" if EMBEDDED || !X86
default y default y
select SERIO select SERIO
select SERIO_LIBPS2 select SERIO_LIBPS2
......
...@@ -22,7 +22,7 @@ config SERIO_I8042 ...@@ -22,7 +22,7 @@ config SERIO_I8042
tristate "i8042 PC Keyboard controller" if EMBEDDED || !X86 tristate "i8042 PC Keyboard controller" if EMBEDDED || !X86
default y default y
depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && \ depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && \
(!SUPERH || SH_CAYMAN) && !M68K && !BLACKFIN && !X86_MRST (!SUPERH || SH_CAYMAN) && !M68K && !BLACKFIN
help help
i8042 is the chip over which the standard AT keyboard and PS/2 i8042 is the chip over which the standard AT keyboard and PS/2
mouse are connected to the computer. If you use these devices, mouse are connected to the computer. If you use these devices,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment