Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 808fa62f authored by Christian Dietrich's avatar Christian Dietrich Committed by Geert Uytterhoeven
Browse files

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: default avatarChristian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de>
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent f6f94e2a

arch/m68k/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -434,7 +434,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
@@ -445,7 +445,7 @@ config ISA 


config GENERIC_ISA_DMA

	bool

	depends on Q40 || AMIGA_PCMCIA || GG2

	depends on Q40 || AMIGA_PCMCIA

	default y



config ZONE_DMA

arch/m68k/include/asm/amigahw.h

+0 −1
Original line number Diff line number Diff line
@@ -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 */

};

arch/m68k/include/asm/io_mm.h

+1 −38
Original line number Diff line number Diff line
@@ -49,23 +49,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>
@@ -89,8 +72,7 @@ extern unsigned long gg2_isa_base; 
#endif



#define ISA_TYPE_Q40 (1)

#define ISA_TYPE_GG2 (2)

#define ISA_TYPE_AG  (3)

#define ISA_TYPE_AG  (2)



#if defined(CONFIG_Q40) && !defined(MULTI_ISA)

#define ISA_TYPE ISA_TYPE_Q40
@@ -100,10 +82,6 @@ extern unsigned long gg2_isa_base; 
#define ISA_TYPE ISA_TYPE_AG

#define ISA_SEX  1

#endif

#if defined(CONFIG_GG2) && !defined(MULTI_ISA)

#define ISA_TYPE ISA_TYPE_GG2

#define ISA_SEX  0

#endif



#ifdef MULTI_ISA

extern int isa_type;
@@ -125,9 +103,6 @@ static inline u8 __iomem *isa_itb(unsigned long addr) 
#ifdef CONFIG_Q40

    case ISA_TYPE_Q40: return (u8 __iomem *)Q40_ISA_IO_B(addr);

#endif

#ifdef CONFIG_GG2

    case ISA_TYPE_GG2: return (u8 __iomem *)GG2_ISA_IO_B(addr);

#endif

#ifdef CONFIG_AMIGA_PCMCIA

    case ISA_TYPE_AG: return (u8 __iomem *)AG_ISA_IO_B(addr);

#endif
@@ -141,9 +116,6 @@ static inline u16 __iomem *isa_itw(unsigned long addr) 
#ifdef CONFIG_Q40

    case ISA_TYPE_Q40: return (u16 __iomem *)Q40_ISA_IO_W(addr);

#endif

#ifdef CONFIG_GG2

    case ISA_TYPE_GG2: return (u16 __iomem *)GG2_ISA_IO_W(addr);

#endif

#ifdef CONFIG_AMIGA_PCMCIA

    case ISA_TYPE_AG: return (u16 __iomem *)AG_ISA_IO_W(addr);

#endif
@@ -167,9 +139,6 @@ static inline u8 __iomem *isa_mtb(unsigned long addr) 
#ifdef CONFIG_Q40

    case ISA_TYPE_Q40: return (u8 __iomem *)Q40_ISA_MEM_B(addr);

#endif

#ifdef CONFIG_GG2

    case ISA_TYPE_GG2: return (u8 __iomem *)GG2_ISA_MEM_B(addr);

#endif

#ifdef CONFIG_AMIGA_PCMCIA

    case ISA_TYPE_AG: return (u8 __iomem *)addr;

#endif
@@ -183,9 +152,6 @@ static inline u16 __iomem *isa_mtw(unsigned long addr) 
#ifdef CONFIG_Q40

    case ISA_TYPE_Q40: return (u16 __iomem *)Q40_ISA_MEM_W(addr);

#endif

#ifdef CONFIG_GG2

    case ISA_TYPE_GG2: return (u16 __iomem *)GG2_ISA_MEM_W(addr);

#endif

#ifdef CONFIG_AMIGA_PCMCIA

    case ISA_TYPE_AG: return (u16 __iomem *)addr;

#endif
@@ -217,9 +183,6 @@ static inline void isa_delay(void) 
#ifdef CONFIG_Q40

    case ISA_TYPE_Q40: isa_outb(0,0x80); break;

#endif

#ifdef CONFIG_GG2

    case ISA_TYPE_GG2: break;

#endif

#ifdef CONFIG_AMIGA_PCMCIA

    case ISA_TYPE_AG: break;

#endif

arch/m68k/kernel/setup.c

+0 −6
Original line number Diff line number Diff line
@@ -359,12 +359,6 @@ void __init setup_arch(char **cmdline_p) 
		isa_type = ISA_TYPE_Q40;

		isa_sex = 0;

	}

#ifdef CONFIG_GG2

	if (MACH_IS_AMIGA && AMIGAHW_PRESENT(GG2_ISA)) {

		isa_type = ISA_TYPE_GG2;

		isa_sex = 0;

	}

#endif

#ifdef CONFIG_AMIGA_PCMCIA

	if (MACH_IS_AMIGA && AMIGAHW_PRESENT(PCMCIA)) {

		isa_type = ISA_TYPE_AG;