OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0aac881
acea7c7
)
Merge branch 'iomap' into cleanup
author
Tony Lindgren
<tony@atomide.com>
Tue, 28 Feb 2012 22:27:01 +0000
(14:27 -0800)
committer
Tony 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
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap1/pm.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/emu.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/pm24xx.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/arm/mach-omap1/include/mach/entry-macro.S
index
83c0250
,
68d2679
..
fa0f32a
---
1
/
arch/arm/mach-omap1/include/mach/entry-macro.S
---
2
/
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
diff --cc
arch/arm/mach-omap1/pm.c
Simple merge
diff --cc
arch/arm/mach-omap2/emu.c
Simple merge
diff --cc
arch/arm/mach-omap2/pm24xx.c
Simple merge