diff options
| author | Dave Jones <davej@redhat.com> | 2005-11-29 15:48:34 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2005-11-29 15:48:34 -0500 |
| commit | be37bdbce7ceaacf4f20c6cc759efbe75ebd1196 (patch) | |
| tree | f1a42fb5a4a17eea41d47d2c002fa303009f5523 /include/asm-arm/arch-ebsa110/io.h | |
| parent | 019a61b99338d0ac05de25317b85da88e7ec4b35 (diff) | |
| parent | d70aa5e4b54aa7e704c886838715ac8a45d5750f (diff) | |
Merge ../linus
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 68e04c0bb3f7..ae048441c9ed 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); | |||
| 64 | #define writew(v,b) __writew(v,b) | 64 | #define writew(v,b) __writew(v,b) |
| 65 | #define writel(v,b) __writel(v,b) | 65 | #define writel(v,b) __writel(v,b) |
| 66 | 66 | ||
| 67 | #define __arch_ioremap(cookie,sz,c,a) ((void __iomem *)(cookie)) | 67 | #define __arch_ioremap(cookie,sz,c) ((void __iomem *)(cookie)) |
| 68 | #define __arch_iounmap(cookie) do { } while (0) | 68 | #define __arch_iounmap(cookie) do { } while (0) |
| 69 | 69 | ||
| 70 | extern void insb(unsigned int port, void *buf, int sz); | 70 | extern void insb(unsigned int port, void *buf, int sz); |