openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Input: fixup X86_MRST selects" 

This reverts commit 0b28bac5ae.

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>
This commit is contained in:
Feng Tang 2010-07-05 23:03:21 +08:00 committed by H. Peter Anvin
parent 44631ac64d
commit c9d46f63f8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/input/keyboard/Kconfig
View File

@ -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

2
drivers/input/serio/Kconfig
View File

@ -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,