Merge http://www.kernel.org/pub/scm/linux/kernel/git/perex/alsa

[mv-sheeva.git] / drivers / input / keyboard / Kconfig

diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 4a917748fd9ffac79f863675574ffd2155994858..a9dda56f62c412a8af7b4be41edb94abe847b361 100644 (file)
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -13,7 +13,7 @@ menuconfig INPUT_KEYBOARD
 if INPUT_KEYBOARD
 
 config KEYBOARD_ATKBD
-       tristate "AT keyboard" if !X86_PC
+       tristate "AT keyboard" if EMBEDDED || !X86_PC
        default y
        select SERIO
        select SERIO_LIBPS2
@@ -143,16 +143,6 @@ config KEYBOARD_SPITZ
          To compile this driver as a module, choose M here: the
          module will be called spitzkbd.
 
-config KEYBOARD_MAPLE
-       tristate "Maple bus keyboard"
-       depends on SH_DREAMCAST && MAPLE
-       help
-         Say Y here if you have a DreamCast console running Linux and have
-         a keyboard attached to its Maple bus.
-
-         To compile this driver as a module, choose M here: the
-         module will be called maple_keyb.
-
 config KEYBOARD_AMIGA
        tristate "Amiga keyboard"
        depends on AMIGA