projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5f61296 19f3a98)
Merge branch 'cleanup-hwmod' into cleanup
authorTony Lindgren <tony@atomide.com>
Thu, 28 Jun 2012 12:47:01 +0000 (05:47 -0700)
committerTony 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 88ffa1e645cd948614afe61c17502533c64650a7,8b251a995abfa0ed3f5e2e682b0af81d1a71a3e4..a636ebc16b3975f8ae49cc9c18bd676920baf4df
--- 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