Merge git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

2 files changed, 0 insertions, 11 deletions

diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 4a917748fd9f..3b0ac3b43c54 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -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
diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile
index 9ce0b87f2fac..6e0afbb22383 100644
--- a/drivers/input/keyboard/Makefile
+++ b/drivers/input/keyboard/Makefile
@@ -5,7 +5,6 @@
 # Each configuration option enables a list of files.
 
 obj-$(CONFIG_KEYBOARD_ATKBD)            += atkbd.o
-obj-$(CONFIG_KEYBOARD_MAPLE)            += maple_keyb.o
 obj-$(CONFIG_KEYBOARD_SUNKBD)           += sunkbd.o
 obj-$(CONFIG_KEYBOARD_LKKBD)            += lkkbd.o
 obj-$(CONFIG_KEYBOARD_XTKBD)            += xtkbd.o