Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

[pandora-kernel.git] / arch / m68k / include / asm / amigahw.h

diff --git a/arch/m68k/include/asm/amigahw.h b/arch/m68k/include/asm/amigahw.h
index 5ca5dd9..7a19b56 100644 (file)
--- a/arch/m68k/include/asm/amigahw.h
+++ b/arch/m68k/include/asm/amigahw.h
@@ -102,7 +102,6 @@ struct amiga_hw_present {
     AMIGAHW_DECLARE(ALICE_NTSC);       /* NTSC Alice (8374) */
     AMIGAHW_DECLARE(MAGIC_REKICK);     /* A3000 Magic Hard Rekick */
     AMIGAHW_DECLARE(PCMCIA);           /* PCMCIA Slot */
-    AMIGAHW_DECLARE(GG2_ISA);          /* GG2 Zorro2ISA Bridge */
     AMIGAHW_DECLARE(ZORRO);            /* Zorro AutoConfig */
     AMIGAHW_DECLARE(ZORRO3);           /* Zorro III */
 };