diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-05-09 15:21:11 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-05-11 12:20:06 -0400 |
| commit | f75fd965d500d33720948f30d409c6c7729a80af (patch) | |
| tree | ce2ae1a7c8586b545d27830c2d9d229914bc659c /include/asm-arm/arch-iop32x | |
| parent | 3b11e449b3a8d9b912d80e28f62985f22a70e87f (diff) | |
[ARM] Fix iop32x/iop33x build
arch/arm/plat-iop/io.c:26: error: conflicting types for '__iop3xx_ioremap'
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include/asm-arm/arch-iop32x')
| -rw-r--r-- | include/asm-arm/arch-iop32x/io.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-iop32x/io.h b/include/asm-arm/arch-iop32x/io.h index 994f16af5057..958af751a484 100644 --- a/include/asm-arm/arch-iop32x/io.h +++ b/include/asm-arm/arch-iop32x/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 |