Merge branch 'iomap' into cleanup

[mirror_ubuntu-artful-kernel.git] / arch / arm / mach-omap1 / include / mach / entry-macro.S

diff --git a/arch/arm/mach-omap1/include/mach/entry-macro.S b/arch/arm/mach-omap1/include/mach/entry-macro.S
index 83c0250c530a5c3cb0df6ca4b13ac2d544db3c15..fa0f32a686aa73669c9de53945461647b57044e1 100644 (file)
--- a/arch/arm/mach-omap1/include/mach/entry-macro.S
+++ b/arch/arm/mach-omap1/include/mach/entry-macro.S
@@ -9,10 +9,12 @@
  * License version 2. This program is licensed "as is" without any
  * warranty of any kind, whether express or implied.
  */
+
 #include <mach/hardware.h>
 #include <mach/io.h>
 #include <mach/irqs.h>
-#include <asm/hardware/gic.h>
+
+#include "../../iomap.h"
 
                .macro  get_irqnr_preamble, base, tmp
                .endm