diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-21 19:00:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-21 19:00:05 -0800 |
| commit | 66b5920f61b020fc2fc34fef9c4fcdd86df3b52e (patch) | |
| tree | f516e0e9c9579aa30515b2ff23242871fe503a6f /include/asm-arm/arch-ebsa110/io.h | |
| parent | 49bd96c2caa3f02a9273d31b96e75b7574af8c06 (diff) | |
| parent | 9b73fcf85f65a301107c89e05227cd6fd6965680 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include/asm-arm/arch-ebsa110/io.h')
| -rw-r--r-- | include/asm-arm/arch-ebsa110/io.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-ebsa110/io.h b/include/asm-arm/arch-ebsa110/io.h index 68e04c0bb3f..ae048441c9e 100644 --- a/include/asm-arm/arch-ebsa110/io.h +++ b/include/asm-arm/arch-ebsa110/io.h @@ -64,7 +64,7 @@ void __writel(u32 val, void __iomem *addr); #define writew(v,b) __writew(v,b) #define writel(v,b) __writel(v,b) -#define __arch_ioremap(cookie,sz,c,a) ((void __iomem *)(cookie)) +#define __arch_ioremap(cookie,sz,c) ((void __iomem *)(cookie)) #define __arch_iounmap(cookie) do { } while (0) extern void insb(unsigned int port, void *buf, int sz); |