OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5f61296
19f3a98
)
Merge branch 'cleanup-hwmod' into cleanup
author
Tony Lindgren
<tony@atomide.com>
Thu, 28 Jun 2012 12:47:01 +0000
(
05:47
-0700)
committer
Tony Lindgren
<tony@atomide.com>
Thu, 28 Jun 2012 12:47:01 +0000
(
05:47
-0700)
Conflicts:
arch/arm/mach-omap2/dsp.c
1
2
arch/arm/mach-omap2/Makefile
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/clock3xxx_data.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/dsp.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/omap_hwmod.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/arm/mach-omap2/Makefile
Simple merge
diff --cc
arch/arm/mach-omap2/clock3xxx_data.c
Simple merge
diff --cc
arch/arm/mach-omap2/dsp.c
index
88ffa1e
,
8b251a9
..
a636ebc
---
1
/
arch/arm/mach-omap2/dsp.c
---
2
/
arch/arm/mach-omap2/dsp.c
+++ b/
arch/arm/mach-omap2/dsp.c
@@@
-20,9
-20,7
+20,10
@@@
#include <linux/module.h>
#include <linux/platform_device.h>
+
+#include <asm/memblock.h>
+
+ #include "control.h"
#include "cm2xxx_3xxx.h"
#include "prm2xxx_3xxx.h"
#ifdef CONFIG_BRIDGE_DVFS
diff --cc
arch/arm/mach-omap2/omap_hwmod.c
Simple merge
diff --cc
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
Simple merge