Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh...

[linux-2.6-omap-h63xx.git] / arch / m68k / Kconfig

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 85cdd23b0447e2dafd1ed517a2a2cd66910da365..a86e2e9a639fff5c20a9378cf9f27c52158a4623 100644 (file)
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -418,9 +418,6 @@ config STRAM_PROC
        help
          Say Y here to report ST-RAM usage statistics in /proc/stram.
 
-config ATARI_KBD_CORE
-       bool
-
 config HEARTBEAT
        bool "Use power LED as a heartbeat" if AMIGA || APOLLO || ATARI || MAC ||Q40
        default y if !AMIGA && !APOLLO && !ATARI && !MAC && !Q40 && HP300