Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

m68k: Remove dead GG2 config option

CONFIG_GG2 doesn't exist in Kconfig, therefore remove
all references to it from the source.

Signed-off-by: Christian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

authored by

Christian Dietrich and committed by
Geert Uytterhoeven
808fa62f f6f94e2a

+3 -47
+2 -2
arch/m68k/Kconfig
··· 434 434 435 435 config ISA 436 436 bool 437 - depends on Q40 || AMIGA_PCMCIA || GG2 437 + depends on Q40 || AMIGA_PCMCIA 438 438 default y 439 439 help 440 440 Find out whether you have ISA slots on your motherboard. ISA is the ··· 445 445 446 446 config GENERIC_ISA_DMA 447 447 bool 448 - depends on Q40 || AMIGA_PCMCIA || GG2 448 + depends on Q40 || AMIGA_PCMCIA 449 449 default y 450 450 451 451 config ZONE_DMA
-1
arch/m68k/include/asm/amigahw.h
··· 102 102 AMIGAHW_DECLARE(ALICE_NTSC); /* NTSC Alice (8374) */ 103 103 AMIGAHW_DECLARE(MAGIC_REKICK); /* A3000 Magic Hard Rekick */ 104 104 AMIGAHW_DECLARE(PCMCIA); /* PCMCIA Slot */ 105 - AMIGAHW_DECLARE(GG2_ISA); /* GG2 Zorro2ISA Bridge */ 106 105 AMIGAHW_DECLARE(ZORRO); /* Zorro AutoConfig */ 107 106 AMIGAHW_DECLARE(ZORRO3); /* Zorro III */ 108 107 };
+1 -38
arch/m68k/include/asm/io_mm.h
··· 49 49 #define MULTI_ISA 0 50 50 #endif /* Q40 */ 51 51 52 - /* GG-II Zorro to ISA bridge */ 53 - #ifdef CONFIG_GG2 54 - 55 - extern unsigned long gg2_isa_base; 56 - #define GG2_ISA_IO_B(ioaddr) (gg2_isa_base+1+((unsigned long)(ioaddr)*4)) 57 - #define GG2_ISA_IO_W(ioaddr) (gg2_isa_base+ ((unsigned long)(ioaddr)*4)) 58 - #define GG2_ISA_MEM_B(madr) (gg2_isa_base+1+(((unsigned long)(madr)*4) & 0xfffff)) 59 - #define GG2_ISA_MEM_W(madr) (gg2_isa_base+ (((unsigned long)(madr)*4) & 0xfffff)) 60 - 61 - #ifndef MULTI_ISA 62 - #define MULTI_ISA 0 63 - #else 64 - #undef MULTI_ISA 65 - #define MULTI_ISA 1 66 - #endif 67 - #endif /* GG2 */ 68 - 69 52 #ifdef CONFIG_AMIGA_PCMCIA 70 53 #include <asm/amigayle.h> 71 54 ··· 72 89 #endif 73 90 74 91 #define ISA_TYPE_Q40 (1) 75 - #define ISA_TYPE_GG2 (2) 76 - #define ISA_TYPE_AG (3) 92 + #define ISA_TYPE_AG (2) 77 93 78 94 #if defined(CONFIG_Q40) && !defined(MULTI_ISA) 79 95 #define ISA_TYPE ISA_TYPE_Q40 ··· 81 99 #if defined(CONFIG_AMIGA_PCMCIA) && !defined(MULTI_ISA) 82 100 #define ISA_TYPE ISA_TYPE_AG 83 101 #define ISA_SEX 1 84 - #endif 85 - #if defined(CONFIG_GG2) && !defined(MULTI_ISA) 86 - #define ISA_TYPE ISA_TYPE_GG2 87 - #define ISA_SEX 0 88 102 #endif 89 103 90 104 #ifdef MULTI_ISA ··· 103 125 #ifdef CONFIG_Q40 104 126 case ISA_TYPE_Q40: return (u8 __iomem *)Q40_ISA_IO_B(addr); 105 127 #endif 106 - #ifdef CONFIG_GG2 107 - case ISA_TYPE_GG2: return (u8 __iomem *)GG2_ISA_IO_B(addr); 108 - #endif 109 128 #ifdef CONFIG_AMIGA_PCMCIA 110 129 case ISA_TYPE_AG: return (u8 __iomem *)AG_ISA_IO_B(addr); 111 130 #endif ··· 115 140 { 116 141 #ifdef CONFIG_Q40 117 142 case ISA_TYPE_Q40: return (u16 __iomem *)Q40_ISA_IO_W(addr); 118 - #endif 119 - #ifdef CONFIG_GG2 120 - case ISA_TYPE_GG2: return (u16 __iomem *)GG2_ISA_IO_W(addr); 121 143 #endif 122 144 #ifdef CONFIG_AMIGA_PCMCIA 123 145 case ISA_TYPE_AG: return (u16 __iomem *)AG_ISA_IO_W(addr); ··· 139 167 #ifdef CONFIG_Q40 140 168 case ISA_TYPE_Q40: return (u8 __iomem *)Q40_ISA_MEM_B(addr); 141 169 #endif 142 - #ifdef CONFIG_GG2 143 - case ISA_TYPE_GG2: return (u8 __iomem *)GG2_ISA_MEM_B(addr); 144 - #endif 145 170 #ifdef CONFIG_AMIGA_PCMCIA 146 171 case ISA_TYPE_AG: return (u8 __iomem *)addr; 147 172 #endif ··· 151 182 { 152 183 #ifdef CONFIG_Q40 153 184 case ISA_TYPE_Q40: return (u16 __iomem *)Q40_ISA_MEM_W(addr); 154 - #endif 155 - #ifdef CONFIG_GG2 156 - case ISA_TYPE_GG2: return (u16 __iomem *)GG2_ISA_MEM_W(addr); 157 185 #endif 158 186 #ifdef CONFIG_AMIGA_PCMCIA 159 187 case ISA_TYPE_AG: return (u16 __iomem *)addr; ··· 182 216 { 183 217 #ifdef CONFIG_Q40 184 218 case ISA_TYPE_Q40: isa_outb(0,0x80); break; 185 - #endif 186 - #ifdef CONFIG_GG2 187 - case ISA_TYPE_GG2: break; 188 219 #endif 189 220 #ifdef CONFIG_AMIGA_PCMCIA 190 221 case ISA_TYPE_AG: break;
-6
arch/m68k/kernel/setup.c
··· 359 359 isa_type = ISA_TYPE_Q40; 360 360 isa_sex = 0; 361 361 } 362 - #ifdef CONFIG_GG2 363 - if (MACH_IS_AMIGA && AMIGAHW_PRESENT(GG2_ISA)) { 364 - isa_type = ISA_TYPE_GG2; 365 - isa_sex = 0; 366 - } 367 - #endif 368 362 #ifdef CONFIG_AMIGA_PCMCIA 369 363 if (MACH_IS_AMIGA && AMIGAHW_PRESENT(PCMCIA)) { 370 364 isa_type = ISA_TYPE_AG;