Commit adaf9410 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds

[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>
parent c20f0856
...@@ -952,8 +952,9 @@ static int amiga_get_hardware_list(char *buffer) ...@@ -952,8 +952,9 @@ static int amiga_get_hardware_list(char *buffer)
AMIGAHW_ANNOUNCE(MAGIC_REKICK, "Magic Hard Rekick"); AMIGAHW_ANNOUNCE(MAGIC_REKICK, "Magic Hard Rekick");
AMIGAHW_ANNOUNCE(PCMCIA, "PCMCIA Slot"); AMIGAHW_ANNOUNCE(PCMCIA, "PCMCIA Slot");
if (AMIGAHW_PRESENT(ZORRO)) if (AMIGAHW_PRESENT(ZORRO))
len += sprintf(buffer+len, "\tZorro%s AutoConfig: %d Expansion Device%s\n", len += sprintf(buffer+len, "\tZorro II%s AutoConfig: %d Expansion "
AMIGAHW_PRESENT(ZORRO3) ? " III" : "", "Device%s\n",
AMIGAHW_PRESENT(ZORRO3) ? "I" : "",
zorro_num_autocon, zorro_num_autocon == 1 ? "" : "s"); zorro_num_autocon, zorro_num_autocon == 1 ? "" : "s");
#undef AMIGAHW_ANNOUNCE #undef AMIGAHW_ANNOUNCE
......
...@@ -7,7 +7,7 @@ export-objs := zorro.o ...@@ -7,7 +7,7 @@ export-objs := zorro.o
obj-$(CONFIG_ZORRO) += zorro.o names.o obj-$(CONFIG_ZORRO) += zorro.o names.o
obj-$(CONFIG_PROC_FS) += proc.o obj-$(CONFIG_PROC_FS) += proc.o
host-progs := gen_devlist host-progs := gen-devlist
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
5000 A2620 68020 [Accelerator and RAM Expansion] 5000 A2620 68020 [Accelerator and RAM Expansion]
5100 A2630 68030 [Accelerator and RAM Expansion] 5100 A2630 68030 [Accelerator and RAM Expansion]
5400 A4091 [SCSI Host Adapter] 5400 A4091 [SCSI Host Adapter]
5a00 A2065 [Ethernet Card]] 5a00 A2065 [Ethernet Card]
6000 Romulator Card 6000 Romulator Card
6100 A3000 Test Fixture [Miscellaneous Expansion Card] 6100 A3000 Test Fixture [Miscellaneous Expansion Card]
6700 A2386-SX [ISA Bus Bridge] 6700 A2386-SX [ISA Bus Bridge]
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
02ff Kolff Computer Supplies 02ff Kolff Computer Supplies
0000 KCS Power PC [ISA Bus Bridge] 0000 KCS Power PC [ISA Bus Bridge]
03ec Cardco Ltd. 03ec Cardco Ltd.
0400 Kronos 2000 [SCSI Host Adapter]] 0400 Kronos 2000 [SCSI Host Adapter]
0c00 A1000 [SCSI Host Adapter] 0c00 A1000 [SCSI Host Adapter]
0e00 Escort [SCSI Host Adapter] 0e00 Escort [SCSI Host Adapter]
f500 A2410 HiRes [Graphics Card] f500 A2410 HiRes [Graphics Card]
......
#ifndef _ASM_M68K_ZORRO_H #ifndef _ASM_M68K_ZORRO_H
#define _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_readb raw_inb
#define z_readw raw_inw #define z_readw raw_inw
...@@ -14,22 +15,6 @@ ...@@ -14,22 +15,6 @@
#define z_memcpy_fromio(a,b,c) memcpy((a),(void *)(b),(c)) #define z_memcpy_fromio(a,b,c) memcpy((a),(void *)(b),(c))
#define z_memcpy_toio(a,b,c) memcpy((void *)(a),(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, extern inline void *z_remap_nocache_ser(unsigned long physaddr,
unsigned long size) unsigned long size)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment