tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Feng Tang and committed by
H. Peter Anvin c9d46f63 44631ac6

+2 -2
+1 -1
drivers/input/keyboard/Kconfig
··· 69 69 module will be called atakbd. 70 70 71 71 config KEYBOARD_ATKBD 72 - tristate "AT keyboard" if EMBEDDED || !X86 || X86_MRST 72 + tristate "AT keyboard" if EMBEDDED || !X86 73 73 default y 74 74 select SERIO 75 75 select SERIO_LIBPS2
+1 -1
drivers/input/serio/Kconfig
··· 22 22 tristate "i8042 PC Keyboard controller" if EMBEDDED || !X86 23 23 default y 24 24 depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && \ 25 - (!SUPERH || SH_CAYMAN) && !M68K && !BLACKFIN && !X86_MRST 25 + (!SUPERH || SH_CAYMAN) && !M68K && !BLACKFIN 26 26 help 27 27 i8042 is the chip over which the standard AT keyboard and PS/2 28 28 mouse are connected to the computer. If you use these devices,