Merge branch 'iomap' into cleanup
authorTony Lindgren <tony@atomide.com>
Tue, 28 Feb 2012 22:27:01 +0000 (14:27 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 28 Feb 2012 22:27:01 +0000 (14:27 -0800)
1  2 
arch/arm/mach-omap1/include/mach/entry-macro.S
arch/arm/mach-omap1/pm.c
arch/arm/mach-omap2/emu.c
arch/arm/mach-omap2/pm24xx.c

index 83c0250c530a5c3cb0df6ca4b13ac2d544db3c15,68d2679936ff714e42f63f7399c4410f7a3abb62..fa0f32a686aa73669c9de53945461647b57044e1
  #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
  
Simple merge
Simple merge
Simple merge