Merge tag 'v3.16-rc6' into next

[linux-2.6-microblaze.git] / drivers / input / keyboard / Kconfig

diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 942338b..a3958c6 100644 (file)
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -71,7 +71,7 @@ config KEYBOARD_ATKBD
        default y
        select SERIO
        select SERIO_LIBPS2
-       select SERIO_I8042 if X86
+       select SERIO_I8042 if ARCH_MIGHT_HAVE_PC_SERIO
        select SERIO_GSCPS2 if GSC
        help
          Say Y here if you want to use a standard AT or PS/2 keyboard. Usually