Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=f75fd965d500d33720948f30d409c6c7729a80af
Commit: f75fd965d500d33720948f30d409c6c7729a80af
Parent: 3b11e449b3a8d9b912d80e28f62985f22a70e87f
Author: Russell King <[EMAIL PROTECTED]>
AuthorDate: Wed May 9 20:21:11 2007 +0100
Committer: Russell King <[EMAIL PROTECTED]>
CommitDate: Fri May 11 17:20:06 2007 +0100
[ARM] Fix iop32x/iop33x build
arch/arm/plat-iop/io.c:26: error: conflicting types for '__iop3xx_ioremap'
Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
include/asm-arm/arch-iop13xx/io.h | 2 +-
include/asm-arm/arch-iop32x/io.h | 2 +-
include/asm-arm/arch-iop33x/io.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/asm-arm/arch-iop13xx/io.h
b/include/asm-arm/arch-iop13xx/io.h
index 7dfff4a..a6e0f9e 100644
--- a/include/asm-arm/arch-iop13xx/io.h
+++ b/include/asm-arm/arch-iop13xx/io.h
@@ -27,7 +27,7 @@
extern void __iomem * __iop13xx_io(unsigned long io_addr);
extern void __iomem *__iop13xx_ioremap(unsigned long cookie, size_t size,
- unsigned long flags);
+ unsigned int mtype);
extern void __iop13xx_iounmap(void __iomem *addr);
extern u32 iop13xx_atue_mem_base;
diff --git a/include/asm-arm/arch-iop32x/io.h b/include/asm-arm/arch-iop32x/io.h
index 994f16a..958af75 100644
--- a/include/asm-arm/arch-iop32x/io.h
+++ b/include/asm-arm/arch-iop32x/io.h
@@ -14,7 +14,7 @@
#include <asm/hardware.h>
extern void __iomem *__iop3xx_ioremap(unsigned long cookie, size_t size,
- unsigned long flags);
+ unsigned int mtype);
extern void __iop3xx_iounmap(void __iomem *addr);
#define IO_SPACE_LIMIT 0xffffffff
diff --git a/include/asm-arm/arch-iop33x/io.h b/include/asm-arm/arch-iop33x/io.h
index 993f758..fec9c53 100644
--- a/include/asm-arm/arch-iop33x/io.h
+++ b/include/asm-arm/arch-iop33x/io.h
@@ -14,7 +14,7 @@
#include <asm/hardware.h>
extern void __iomem *__iop3xx_ioremap(unsigned long cookie, size_t size,
- unsigned long flags);
+ unsigned int mtype);
extern void __iop3xx_iounmap(void __iomem *addr);
#define IO_SPACE_LIMIT 0xffffffff
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
