diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-05-12 11:12:12 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-05-12 11:12:12 -0400 |
| commit | 158304ef09a28c7f2dd37d78f536a4e09ba084a1 (patch) | |
| tree | 2e6d808fef46d70268e547ccfc5926a865e3d2ea /include/asm-arm/arch-iop33x/io.h | |
| parent | 641e79129a56a4c50be1aed0fa713f440b46a440 (diff) | |
| parent | 25f4a81ef51b7c279786f5b81fe6d89510f46d99 (diff) | |
Merge branch 'fixes' into devel
Diffstat (limited to 'include/asm-arm/arch-iop33x/io.h')
| -rw-r--r-- | include/asm-arm/arch-iop33x/io.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-iop33x/io.h b/include/asm-arm/arch-iop33x/io.h index 993f7589b29f..fec9c53e2b10 100644 --- a/include/asm-arm/arch-iop33x/io.h +++ b/include/asm-arm/arch-iop33x/io.h | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | #include <asm/hardware.h> | 14 | #include <asm/hardware.h> |
| 15 | 15 | ||
| 16 | extern void __iomem *__iop3xx_ioremap(unsigned long cookie, size_t size, | 16 | extern void __iomem *__iop3xx_ioremap(unsigned long cookie, size_t size, |
| 17 | unsigned long flags); | 17 | unsigned int mtype); |
| 18 | extern void __iop3xx_iounmap(void __iomem *addr); | 18 | extern void __iop3xx_iounmap(void __iomem *addr); |
| 19 | 19 | ||
| 20 | #define IO_SPACE_LIMIT 0xffffffff | 20 | #define IO_SPACE_LIMIT 0xffffffff |