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 1812aa048171100572ffd78be4757c65cf93b286..bc9271b85759b51397a97825110184f7491cb286 100644 (file)
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -55,9 +55,6 @@ config HZ
        int
        default 100
 
-config GENERIC_TIME
-       def_bool y
-
 config ARCH_USES_GETTIMEOFFSET
        def_bool y
 
@@ -431,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
@@ -442,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