diff options
| author | Feng Tang <feng.tang@intel.com> | 2010-07-05 11:03:21 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2010-07-07 20:05:07 -0400 |
| commit | c9d46f63f8e89fd70f97b83fdc4e5d2e37d92aeb (patch) | |
| tree | f4a633ea3f534bfc3b8eb8cd1438119b4a2ff169 /drivers/input/keyboard | |
| parent | 44631ac64d06d2f7ce006c2a6f2c8e003a9c6ace (diff) | |
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>
Diffstat (limited to 'drivers/input/keyboard')
| -rw-r--r-- | drivers/input/keyboard/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig index 917eec3a9bbb..3525f533e186 100644 --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig | |||
| @@ -69,7 +69,7 @@ config KEYBOARD_ATARI | |||
| 69 | module will be called atakbd. | 69 | module will be called atakbd. |
| 70 | 70 | ||
| 71 | config KEYBOARD_ATKBD | 71 | config KEYBOARD_ATKBD |
| 72 | tristate "AT keyboard" if EMBEDDED || !X86 || X86_MRST | 72 | tristate "AT keyboard" if EMBEDDED || !X86 |
| 73 | default y | 73 | default y |
| 74 | select SERIO | 74 | select SERIO |
| 75 | select SERIO_LIBPS2 | 75 | select SERIO_LIBPS2 |