From: Tony Lindgren <tony@atomide.com>
Date: Tue, 28 Feb 2012 22:27:01 +0000 (-0800)
Subject: Merge branch 'iomap' into cleanup
X-Git-Tag: v3.4-rc1~34^2~7^2~1
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=a5bee307ba7befc96a97915d6d45ffbe1e5f9a20;p=linux.git

Merge branch 'iomap' into cleanup
---

a5bee307ba7befc96a97915d6d45ffbe1e5f9a20
diff --cc arch/arm/mach-omap1/include/mach/entry-macro.S
index 83c0250c530a,68d2679936ff..fa0f32a686aa
--- a/arch/arm/mach-omap1/include/mach/entry-macro.S
+++ b/arch/arm/mach-omap1/include/mach/entry-macro.S
@@@ -12,8 -13,12 +13,9 @@@
  #include <mach/hardware.h>
  #include <mach/io.h>
  #include <mach/irqs.h>
- #include <asm/hardware/gic.h>
+ 
+ #include "../../iomap.h"
  
 - 		.macro	disable_fiq
 -		.endm
 -
  		.macro  get_irqnr_preamble, base, tmp
  		.endm