Revert "Input: do not force selecting i8042 on Moorestown"

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

This reverts commit 685afae02557a178185a4be36f58332976e79f63.

After adding x86_platform's detection for i8042 controller, we
don't need the force dependency on !X86_MRST any more

Cc: Jacob Pan <jacob.jun.pan@linux.intel.com>
Signed-off-by: Feng Tang <feng.tang@intel.com>
LKML-Reference: <1278342202-10973-4-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 15 years ago 44631ac6 6d2cce62

+2 -2

2 changed files

expand all

drivers

input

keyboard

Kconfig

mouse

Kconfig

+1 -1

drivers/input/keyboard/Kconfig

··· 73 73 default y 74 74 select SERIO 75 75 select SERIO_LIBPS2 76 - select SERIO_I8042 if X86 && !X86_MRST 76 + select SERIO_I8042 if X86 77 77 select SERIO_GSCPS2 if GSC 78 78 help 79 79 Say Y here if you want to use a standard AT or PS/2 keyboard. Usually

+1 -1

drivers/input/mouse/Kconfig

··· 17 17 default y 18 18 select SERIO 19 19 select SERIO_LIBPS2 20 - select SERIO_I8042 if X86 && !X86_MRST 20 + select SERIO_I8042 if X86 21 21 select SERIO_GSCPS2 if GSC 22 22 help 23 23 Say Y here if you have a PS/2 mouse connected to your system. This