diff options
| -rw-r--r-- | arch/ppc/amiga/config.c | 5 | ||||
| -rw-r--r-- | drivers/zorro/Makefile | 2 | ||||
| -rw-r--r-- | drivers/zorro/zorro.ids | 4 | ||||
| -rw-r--r-- | include/asm-m68k/zorro.h | 19 |
4 files changed, 8 insertions, 22 deletions
diff --git a/arch/ppc/amiga/config.c b/arch/ppc/amiga/config.c index 310aa0b907b4..c06708759309 100644 --- a/arch/ppc/amiga/config.c +++ b/arch/ppc/amiga/config.c @@ -952,8 +952,9 @@ static int amiga_get_hardware_list(char *buffer) AMIGAHW_ANNOUNCE(MAGIC_REKICK, "Magic Hard Rekick"); AMIGAHW_ANNOUNCE(PCMCIA, "PCMCIA Slot"); if (AMIGAHW_PRESENT(ZORRO)) - len += sprintf(buffer+len, "\tZorro%s AutoConfig: %d Expansion Device%s\n", - AMIGAHW_PRESENT(ZORRO3) ? " III" : "", + len += sprintf(buffer+len, "\tZorro II%s AutoConfig: %d Expansion " + "Device%s\n", + AMIGAHW_PRESENT(ZORRO3) ? "I" : "", zorro_num_autocon, zorro_num_autocon == 1 ? "" : "s"); #undef AMIGAHW_ANNOUNCE diff --git a/drivers/zorro/Makefile b/drivers/zorro/Makefile index f53147a91039..61de905e594a 100644 --- a/drivers/zorro/Makefile +++ b/drivers/zorro/Makefile @@ -7,7 +7,7 @@ export-objs := zorro.o obj-$(CONFIG_ZORRO) += zorro.o names.o obj-$(CONFIG_PROC_FS) += proc.o -host-progs := gen_devlist +host-progs := gen-devlist include $(TOPDIR)/Rules.make diff --git a/drivers/zorro/zorro.ids b/drivers/zorro/zorro.ids index 92b0c9184a1f..1f7378847c80 100644 --- a/drivers/zorro/zorro.ids +++ b/drivers/zorro/zorro.ids @@ -42,7 +42,7 @@ 5000 A2620 68020 [Accelerator and RAM Expansion] 5100 A2630 68030 [Accelerator and RAM Expansion] 5400 A4091 [SCSI Host Adapter] - 5a00 A2065 [Ethernet Card]] + 5a00 A2065 [Ethernet Card] 6000 Romulator Card 6100 A3000 Test Fixture [Miscellaneous Expansion Card] 6700 A2386-SX [ISA Bus Bridge] @@ -56,7 +56,7 @@ 02ff Kolff Computer Supplies 0000 KCS Power PC [ISA Bus Bridge] 03ec Cardco Ltd. - 0400 Kronos 2000 [SCSI Host Adapter]] + 0400 Kronos 2000 [SCSI Host Adapter] 0c00 A1000 [SCSI Host Adapter] 0e00 Escort [SCSI Host Adapter] f500 A2410 HiRes [Graphics Card] diff --git a/include/asm-m68k/zorro.h b/include/asm-m68k/zorro.h index fd5f4573631d..69a200802019 100644 --- a/include/asm-m68k/zorro.h +++ b/include/asm-m68k/zorro.h @@ -1,6 +1,7 @@ #ifndef _ASM_M68K_ZORRO_H #define _ASM_M68K_ZORRO_H -#include <asm/raw_io.h> + +#include <asm/io.h> #define z_readb raw_inb #define z_readw raw_inw @@ -14,22 +15,6 @@ #define z_memcpy_fromio(a,b,c) memcpy((a),(void *)(b),(c)) #define z_memcpy_toio(a,b,c) memcpy((void *)(a),(b),(c)) - -/* Values for nocacheflag and cmode */ -#ifndef IOMAP_FULL_CACHING -#define IOMAP_FULL_CACHING 0 -#define IOMAP_NOCACHE_SER 1 -#define IOMAP_NOCACHE_NONSER 2 -#define IOMAP_WRITETHROUGH 3 -#endif - -extern void iounmap(void *addr); - -extern void *__ioremap(unsigned long physaddr, unsigned long size, - int cacheflag); -extern void __iounmap(void *addr, unsigned long size); - - extern inline void *z_remap_nocache_ser(unsigned long physaddr, unsigned long size) { |