Merge Linus' latest into master

[linux-2.6-omap-h63xx.git] / arch / arm / mach-iop13xx / io.c

diff --git a/arch/arm/mach-iop13xx/io.c b/arch/arm/mach-iop13xx/io.c
index 5b22fdeca52c1189e7821cb35d9c8d6bcc4f44ed..26cfa318142cdefe5d0bb5a529041eddaef075cb 100644 (file)
--- a/arch/arm/mach-iop13xx/io.c
+++ b/arch/arm/mach-iop13xx/io.c
@@ -18,7 +18,7 @@
  */
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 
 void * __iomem __iop13xx_io(unsigned long io_addr)