diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2002-11-02 23:53:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-11-02 23:53:58 -0800 |
| commit | 6ade2cd267dbd88f444e0292bf9e95a23d6c42de (patch) | |
| tree | e6552ec88766dbf020ba91f9b156f7f566d07b56 /include | |
| parent | 7de7b525572faf0131a3319ddb75dacda5da2f0a (diff) | |
[PATCH] M68k iomap cleanup
Move m68k low-level iomap definitions from asm/io.h to asm/raw_io.h, so zorro.h
and nubus.h can include raw_io.h instead of io.h (as suggested by Richard
Zidlicky)
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-m68k/io.h | 12 | ||||
| -rw-r--r-- | include/asm-m68k/nubus.h | 2 | ||||
| -rw-r--r-- | include/asm-m68k/raw_io.h | 13 | ||||
| -rw-r--r-- | include/asm-m68k/zorro.h | 2 |
4 files changed, 15 insertions, 14 deletions
diff --git a/include/asm-m68k/io.h b/include/asm-m68k/io.h index d6fb3074ab77..6acb7ffdde15 100644 --- a/include/asm-m68k/io.h +++ b/include/asm-m68k/io.h @@ -280,18 +280,6 @@ static inline void isa_delay(void) #endif /* CONFIG_PCI */ -/* Values for nocacheflag and cmode */ -#define IOMAP_FULL_CACHING 0 -#define IOMAP_NOCACHE_SER 1 -#define IOMAP_NOCACHE_NONSER 2 -#define IOMAP_WRITETHROUGH 3 - -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 *ioremap(unsigned long physaddr, unsigned long size) { return __ioremap(physaddr, size, IOMAP_NOCACHE_SER); diff --git a/include/asm-m68k/nubus.h b/include/asm-m68k/nubus.h index b810d4c3bbe1..6f9ebbf07fc9 100644 --- a/include/asm-m68k/nubus.h +++ b/include/asm-m68k/nubus.h @@ -1,7 +1,7 @@ #ifndef _ASM_M68K_NUBUS_H #define _ASM_M68K_NUBUS_H -#include <asm/io.h> +#include <asm/raw_io.h> #define nubus_readb raw_inb #define nubus_readw raw_inw diff --git a/include/asm-m68k/raw_io.h b/include/asm-m68k/raw_io.h index d794d0f2e557..ca4868f1d42c 100644 --- a/include/asm-m68k/raw_io.h +++ b/include/asm-m68k/raw_io.h @@ -11,6 +11,19 @@ #ifdef __KERNEL__ +/* Values for nocacheflag and cmode */ +#define IOMAP_FULL_CACHING 0 +#define IOMAP_NOCACHE_SER 1 +#define IOMAP_NOCACHE_NONSER 2 +#define IOMAP_WRITETHROUGH 3 + +extern void iounmap(void *addr); + +extern void *__ioremap(unsigned long physaddr, unsigned long size, + int cacheflag); +extern void __iounmap(void *addr, unsigned long size); + + /* ++roman: The assignments to temp. vars avoid that gcc sometimes generates * two accesses to memory, which may be undesirable for some devices. */ diff --git a/include/asm-m68k/zorro.h b/include/asm-m68k/zorro.h index 69a200802019..31c26bf5007a 100644 --- a/include/asm-m68k/zorro.h +++ b/include/asm-m68k/zorro.h @@ -1,7 +1,7 @@ #ifndef _ASM_M68K_ZORRO_H #define _ASM_M68K_ZORRO_H -#include <asm/io.h> +#include <asm/raw_io.h> #define z_readb raw_inb #define z_readw raw_inw |