From 1b48b00d474f6ee98bc9e4e6eb90dab5ab757b72 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Mon, 4 Feb 2008 22:30:30 -0800 Subject: [PATCH] --- yaml --- r: 83153 b: refs/heads/master c: 7e02dbf7249b1eadeb8b225f1af98701cd1320cc h: refs/heads/master i: 83151: 0eda42228666e3a51cf469e1a1030258ca2129ae v: v3 --- [refs] | 2 +- trunk/arch/m68k/Kconfig | 14 -------------- trunk/arch/m68k/configs/mac_defconfig | 1 - 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/[refs] b/[refs] index 370b8130bddc..8a7e549c15bf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 57dfee7c3f1fcac24e986b69bdfdccc8ea025813 +refs/heads/master: 7e02dbf7249b1eadeb8b225f1af98701cd1320cc diff --git a/trunk/arch/m68k/Kconfig b/trunk/arch/m68k/Kconfig index 8236e42ef711..ffabd01c45eb 100644 --- a/trunk/arch/m68k/Kconfig +++ b/trunk/arch/m68k/Kconfig @@ -577,20 +577,6 @@ config MAC_HID depends on INPUT_ADBHID default y -config MAC_ADBKEYCODES - bool "Support for ADB raw keycodes" - depends on INPUT_ADBHID - help - This provides support for sending raw ADB keycodes to console - devices. This is the default up to 2.4.0, but in future this may be - phased out in favor of generic Linux keycodes. If you say Y here, - you can dynamically switch via the - /proc/sys/dev/mac_hid/keyboard_sends_linux_keycodes - sysctl and with the "keyboard_sends_linux_keycodes=" kernel - argument. - - If unsure, say Y here. - config ADB_KEYBOARD bool "Support for ADB keyboard (old driver)" depends on MAC && !INPUT_ADBHID diff --git a/trunk/arch/m68k/configs/mac_defconfig b/trunk/arch/m68k/configs/mac_defconfig index 15b80abfe94a..ff9dffa5b860 100644 --- a/trunk/arch/m68k/configs/mac_defconfig +++ b/trunk/arch/m68k/configs/mac_defconfig @@ -678,7 +678,6 @@ CONFIG_LOGO_MAC_CLUT224=y # CONFIG_MAC_SCC=y CONFIG_MAC_HID=y -CONFIG_MAC_ADBKEYCODES=y CONFIG_SERIAL_CONSOLE=y #