projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1b35af5
9cf793f
)
Merge remote-tracking branch 'omap/hsmmc' into for_3.4/cleanup/pm-base
author
Kevin Hilman
<khilman@ti.com>
Mon, 5 Mar 2012 23:37:04 +0000
(15:37 -0800)
committer
Kevin Hilman
<khilman@ti.com>
Mon, 5 Mar 2012 23:37:04 +0000
(15:37 -0800)
1
2
arch/arm/mach-omap2/board-cm-t35.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/board-n8x0.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/board-rx51-peripherals.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/devices.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/display.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/pm24xx.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/prm44xx.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/arm/mach-omap2/board-cm-t35.c
Simple merge
diff --cc
arch/arm/mach-omap2/board-n8x0.c
Simple merge
diff --cc
arch/arm/mach-omap2/board-rx51-peripherals.c
Simple merge
diff --cc
arch/arm/mach-omap2/devices.c
Simple merge
diff --cc
arch/arm/mach-omap2/display.c
Simple merge
diff --cc
arch/arm/mach-omap2/pm24xx.c
Simple merge
diff --cc
arch/arm/mach-omap2/prm44xx.c
index
f4c1519
,
a1d6154
..
eac623c
---
1
/
arch/arm/mach-omap2/prm44xx.c
---
2
/
arch/arm/mach-omap2/prm44xx.c
+++ b/
arch/arm/mach-omap2/prm44xx.c
@@@
-17,11
-17,11
+17,12
@@@
#include <linux/err.h>
#include <linux/io.h>
-#include "common.h"
#include <plat/cpu.h>
+ #include <plat/irqs.h>
#include <plat/prcm.h>
+#include "iomap.h"
+#include "common.h"
#include "vp.h"
#include "prm44xx.h"
#include "prm-regbits-44xx.h"