浏览代码

[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>
Russell King 18 年之前
父节点
当前提交
f75fd965d5
共有 3 个文件被更改,包括 3 次插入3 次删除
  1. 1 1
      include/asm-arm/arch-iop13xx/io.h
  2. 1 1
      include/asm-arm/arch-iop32x/io.h
  3. 1 1
      include/asm-arm/arch-iop33x/io.h

+ 1 - 1
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;

+ 1 - 1
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

+ 1 - 1
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