summaryrefslogtreecommitdiffstats
path: root/include/asm-arm/arch-iop13xx
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2007-05-12 17:12:12 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-05-12 17:12:12 +0200
commit158304ef09a28c7f2dd37d78f536a4e09ba084a1 (patch)
tree2e6d808fef46d70268e547ccfc5926a865e3d2ea /include/asm-arm/arch-iop13xx
parent[ARM] Use new get_irqnr_preamble (diff)
parentMerge branch 'omap-fixes' into fixes (diff)
downloadlinux-158304ef09a28c7f2dd37d78f536a4e09ba084a1.tar.xz
linux-158304ef09a28c7f2dd37d78f536a4e09ba084a1.zip
Merge branch 'fixes' into devel
Diffstat (limited to 'include/asm-arm/arch-iop13xx')
-rw-r--r--include/asm-arm/arch-iop13xx/io.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-iop13xx/io.h b/include/asm-arm/arch-iop13xx/io.h
index 7dfff4ad82b3..a6e0f9e6ddcf 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;