Merge branch 'uhid' into for-linus

[~andy/linux] / arch / arm / mach-omap1 / sram.S

diff --git a/arch/arm/mach-omap1/sram.S b/arch/arm/mach-omap1/sram.S
index 2ce0b9ab20e51ceb8af03e738d71cd0ecffb4141..00e9d9e9adf1107a442e7454e1f4434cdf54805d 100644 (file)
--- a/arch/arm/mach-omap1/sram.S
+++ b/arch/arm/mach-omap1/sram.S
@@ -12,7 +12,6 @@
 
 #include <asm/assembler.h>
 
-#include <mach/io.h>
 #include <mach/hardware.h>
 
 #include "iomap.h"