Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

[net-next-2.6.git] / arch / m68k / Kconfig

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 723f8f512e315f1bf9cd87a3cc74349f26584883..bc9271b85759b51397a97825110184f7491cb286 100644 (file)
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -428,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
@@ -439,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