Signed-off-by: Robert P. J. Day <rpjday@xxxxxxxxxxxxxx> --- arch/m68k/kernel/setup.c | 5 ----- include/asm-m68k/io.h | 36 ------------------------------------ 2 files changed, 41 deletions(-) diff --git a/arch/m68k/kernel/setup.c b/arch/m68k/kernel/setup.c index 215c7bd..f6e4ee3 100644 --- a/arch/m68k/kernel/setup.c +++ b/arch/m68k/kernel/setup.c @@ -350,11 +350,6 @@ void __init setup_arch(char **cmdline_p) isa_type = Q40_ISA; isa_sex = 0; } -#elif defined(CONFIG_GG2) - if (MACH_IS_AMIGA && AMIGAHW_PRESENT(GG2_ISA)) { - isa_type = GG2_ISA; - isa_sex = 0; - } #elif defined(CONFIG_AMIGA_PCMCIA) if (MACH_IS_AMIGA && AMIGAHW_PRESENT(PCMCIA)) { isa_type = AG_ISA; diff --git a/include/asm-m68k/io.h b/include/asm-m68k/io.h index 5e0fcf4..08366f5 100644 --- a/include/asm-m68k/io.h +++ b/include/asm-m68k/io.h @@ -51,23 +51,6 @@ #define MULTI_ISA 0 #endif /* Q40 */ -/* GG-II Zorro to ISA bridge */ -#ifdef CONFIG_GG2 - -extern unsigned long gg2_isa_base; -#define GG2_ISA_IO_B(ioaddr) (gg2_isa_base+1+((unsigned long)(ioaddr)*4)) -#define GG2_ISA_IO_W(ioaddr) (gg2_isa_base+ ((unsigned long)(ioaddr)*4)) -#define GG2_ISA_MEM_B(madr) (gg2_isa_base+1+(((unsigned long)(madr)*4) & 0xfffff)) -#define GG2_ISA_MEM_W(madr) (gg2_isa_base+ (((unsigned long)(madr)*4) & 0xfffff)) - -#ifndef MULTI_ISA -#define MULTI_ISA 0 -#else -#undef MULTI_ISA -#define MULTI_ISA 1 -#endif -#endif /* GG2 */ - #ifdef CONFIG_AMIGA_PCMCIA #include <asm/amigayle.h> @@ -102,10 +85,6 @@ extern unsigned long gg2_isa_base; #define ISA_TYPE AG_ISA #define ISA_SEX 1 #endif -#if defined(CONFIG_GG2) && !defined(MULTI_ISA) -#define ISA_TYPE GG2_ISA -#define ISA_SEX 0 -#endif #ifdef MULTI_ISA extern int isa_type; @@ -127,9 +106,6 @@ static inline u8 __iomem *isa_itb(unsigned long addr) #ifdef CONFIG_Q40 case Q40_ISA: return (u8 __iomem *)Q40_ISA_IO_B(addr); #endif -#ifdef CONFIG_GG2 - case GG2_ISA: return (u8 __iomem *)GG2_ISA_IO_B(addr); -#endif #ifdef CONFIG_AMIGA_PCMCIA case AG_ISA: return (u8 __iomem *)AG_ISA_IO_B(addr); #endif @@ -143,9 +119,6 @@ static inline u16 __iomem *isa_itw(unsigned long addr) #ifdef CONFIG_Q40 case Q40_ISA: return (u16 __iomem *)Q40_ISA_IO_W(addr); #endif -#ifdef CONFIG_GG2 - case GG2_ISA: return (u16 __iomem *)GG2_ISA_IO_W(addr); -#endif #ifdef CONFIG_AMIGA_PCMCIA case AG_ISA: return (u16 __iomem *)AG_ISA_IO_W(addr); #endif @@ -159,9 +132,6 @@ static inline u8 __iomem *isa_mtb(unsigned long addr) #ifdef CONFIG_Q40 case Q40_ISA: return (u8 __iomem *)Q40_ISA_MEM_B(addr); #endif -#ifdef CONFIG_GG2 - case GG2_ISA: return (u8 __iomem *)GG2_ISA_MEM_B(addr); -#endif #ifdef CONFIG_AMIGA_PCMCIA case AG_ISA: return (u8 __iomem *)addr; #endif @@ -175,9 +145,6 @@ static inline u16 __iomem *isa_mtw(unsigned long addr) #ifdef CONFIG_Q40 case Q40_ISA: return (u16 __iomem *)Q40_ISA_MEM_W(addr); #endif -#ifdef CONFIG_GG2 - case GG2_ISA: return (u16 __iomem *)GG2_ISA_MEM_W(addr); -#endif #ifdef CONFIG_AMIGA_PCMCIA case AG_ISA: return (u16 __iomem *)addr; #endif @@ -207,9 +174,6 @@ static inline void isa_delay(void) #ifdef CONFIG_Q40 case Q40_ISA: isa_outb(0,0x80); break; #endif -#ifdef CONFIG_GG2 - case GG2_ISA: break; -#endif #ifdef CONFIG_AMIGA_PCMCIA case AG_ISA: break; #endif -- ======================================================================== Robert P. J. Day Linux Consulting, Training and Annoying Kernel Pedantry Waterloo, Ontario, CANADA http://fsdev.net/wiki/index.php?title=Main_Page ======================================================================== - To unsubscribe from this list: send the line "unsubscribe linux-m68k" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html