Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[sfrench/cifs-2.6.git] / drivers / input / keyboard / Kconfig

diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index c96ccc136492f023c850666ec2d987a381ae553a..1ba25145b333bb79628d2b08c106825ed1c5c5fa 100644 (file)
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -69,11 +69,11 @@ config KEYBOARD_ATARI
          module will be called atakbd.
 
 config KEYBOARD_ATKBD
          module will be called atakbd.
 
 config KEYBOARD_ATKBD

-       tristate "AT keyboard" if EMBEDDED || !X86 || X86_MRST
+       tristate "AT keyboard" if EMBEDDED || !X86

        default y
        select SERIO
        select SERIO_LIBPS2
        default y
        select SERIO
        select SERIO_LIBPS2

-       select SERIO_I8042 if X86 && !X86_MRST
+       select SERIO_I8042 if X86

        select SERIO_GSCPS2 if GSC
        help
          Say Y here if you want to use a standard AT or PS/2 keyboard. Usually
        select SERIO_GSCPS2 if GSC
        help
          Say Y here if you want to use a standard AT or PS/2 keyboard. Usually