projects
/
GitHub
/
moto-9609
/
android_kernel_motorola_exynos9610.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2d403fe
c0718df
)
Merge remote branch 'remotes/origin/voltage_split_2.6.39' into tmp-integration-2...
author
Paul Walmsley
<paul@pwsan.com>
Fri, 11 Mar 2011 05:43:32 +0000
(22:43 -0700)
committer
Paul Walmsley
<paul@pwsan.com>
Fri, 11 Mar 2011 05:43:32 +0000
(22:43 -0700)
Conflicts:
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
1
2
arch/arm/mach-omap2/Makefile
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/smartreflex.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/plat-omap/include/plat/omap_hwmod.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/arm/mach-omap2/Makefile
Simple merge
diff --cc
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index 17b4fb8c3479c0a44b0646ced9104477dd396c14,8de2de97c2a18359042f45d775cb9f8d3274e44c..c819c306693a2b69dcd62e0f56c210bf6e6bb744
---
1
/
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
---
2
/
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@@
-22,11
-22,7
+22,10
@@@
#include <plat/l4_3xxx.h>
#include <plat/i2c.h>
#include <plat/gpio.h>
- #include <plat/smartreflex.h>
+#include <plat/mmc.h>
+#include <plat/mcbsp.h>
#include <plat/mcspi.h>
+#include <plat/dmtimer.h>
#include "omap_hwmod_common_data.h"
diff --cc
arch/arm/mach-omap2/smartreflex.c
Simple merge
diff --cc
arch/arm/plat-omap/include/plat/omap_hwmod.h
Simple merge