aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k
diff options
context:
space:
mode:
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/Kconfig14
-rw-r--r--arch/m68k/configs/mac_defconfig1
2 files changed, 0 insertions, 15 deletions
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 8236e42ef711..ffabd01c45eb 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -577,20 +577,6 @@ config MAC_HID
577 depends on INPUT_ADBHID 577 depends on INPUT_ADBHID
578 default y 578 default y
579 579
580config MAC_ADBKEYCODES
581 bool "Support for ADB raw keycodes"
582 depends on INPUT_ADBHID
583 help
584 This provides support for sending raw ADB keycodes to console
585 devices. This is the default up to 2.4.0, but in future this may be
586 phased out in favor of generic Linux keycodes. If you say Y here,
587 you can dynamically switch via the
588 /proc/sys/dev/mac_hid/keyboard_sends_linux_keycodes
589 sysctl and with the "keyboard_sends_linux_keycodes=" kernel
590 argument.
591
592 If unsure, say Y here.
593
594config ADB_KEYBOARD 580config ADB_KEYBOARD
595 bool "Support for ADB keyboard (old driver)" 581 bool "Support for ADB keyboard (old driver)"
596 depends on MAC && !INPUT_ADBHID 582 depends on MAC && !INPUT_ADBHID
diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig
index 15b80abfe94a..ff9dffa5b860 100644
--- a/arch/m68k/configs/mac_defconfig
+++ b/arch/m68k/configs/mac_defconfig
@@ -678,7 +678,6 @@ CONFIG_LOGO_MAC_CLUT224=y
678# 678#
679CONFIG_MAC_SCC=y 679CONFIG_MAC_SCC=y
680CONFIG_MAC_HID=y 680CONFIG_MAC_HID=y
681CONFIG_MAC_ADBKEYCODES=y
682CONFIG_SERIAL_CONSOLE=y 681CONFIG_SERIAL_CONSOLE=y
683 682
684# 683#