Merge git://git.infradead.org/mtd-2.6

[linux-2.6] / arch / m68k / configs / mac_defconfig

diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig
index 15b80abfe94a53e2462926f26d2417bed1113ceb..ff9dffa5b860c35f4458d6fc6cb8e82b922940fd 100644 (file)
--- a/arch/m68k/configs/mac_defconfig
+++ b/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
 
 #