[PATCH] M68k update (part 49)

Amiga Zorro bus updates
 - Bring APUS Zorro bus announcement in sync with the m68k version
 - Fix typo in Zorro device generator name
 - Kill duplicate ] in Zorro device ID database
 - Include <asm/io.h> instead of duplicating definitions from <asm/io.h>

diff --git a/arch/ppc/amiga/config.c b/arch/ppc/amiga/config.c
index 310aa0b907b49ac89eb19a373c6a8ff39edf919a..c067087593097dad2d0a256277058cb3af9d35c2 100644 (file)
--- 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 f53147a91039c446a08ce3f62ae4351acfbf5f65..61de905e594a8f3b7aa176587b94e5d4bfe82829 100644 (file)
--- 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 92b0c9184a1f6280b60f77f7709ed09b4da8f6cc..1f7378847c80cd6664baa4c2c750a75125722f65 100644 (file)
--- 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 fd5f4573631dd85aba4c0a19dc7dde6963205b98..69a200802019a480affda80c67b3007818389670 100644 (file)
--- 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)
 {