Merge branch 'linus' into x86/cleanups

[linux-2.6] / include / asm-arm / arch-omap / entry-macro.S

diff --git a/include/asm-arm/arch-omap/entry-macro.S b/include/asm-arm/arch-omap/entry-macro.S
index 74cd57221c8ee14a6845b0ed55ef0f5d6fb851ae..369093a45fcf58b8befb7c34f66431e57230424b 100644 (file)
--- a/include/asm-arm/arch-omap/entry-macro.S
+++ b/include/asm-arm/arch-omap/entry-macro.S
@@ -8,6 +8,7 @@
  * warranty of any kind, whether express or implied.
  */
 #include <asm/hardware.h>
+#include <asm/arch/io.h>
 #include <asm/arch/irqs.h>
 
 #if defined(CONFIG_ARCH_OMAP1)