Merge tag 'v2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / m68k / Kconfig

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 8030e2481d9758352a5c952bb34fc9715e330cc7..bc9271b85759b51397a97825110184f7491cb286 100644 (file)
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -1,7 +1,3 @@
-#
-# For a description of the syntax of this configuration file,
-# see Documentation/kbuild/kconfig-language.txt.
-#
 config M68K
        bool
        default y
@@ -62,8 +58,6 @@ config HZ
 config ARCH_USES_GETTIMEOFFSET
        def_bool y
 
-mainmenu "Linux/68k Kernel Configuration"
-
 source "init/Kconfig"
 
 source "kernel/Kconfig.freezer"
@@ -434,7 +428,7 @@ config PROC_HARDWARE
 
 config ISA
        bool
-       depends on Q40 || AMIGA_PCMCIA || GG2
+       depends on Q40 || AMIGA_PCMCIA
        default y
        help
          Find out whether you have ISA slots on your motherboard.  ISA is the
@@ -445,7 +439,7 @@ config ISA
 
 config GENERIC_ISA_DMA
        bool
-       depends on Q40 || AMIGA_PCMCIA || GG2
+       depends on Q40 || AMIGA_PCMCIA
        default y
 
 config ZONE_DMA