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
arch/arm/mach-omap2/clock3xxx_data.c
arch/arm/mach-omap2/dsp.c
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/mach-omap2/omap_hwmod_44xx_data.c

Simple merge
Simple merge
  
  #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
Simple merge