From: Tony Lindgren <tony@atomide.com>
Date: Thu, 28 Jun 2012 12:47:01 +0000 (-0700)
Subject: Merge branch 'cleanup-hwmod' into cleanup
X-Git-Tag: v3.6-rc1~141^2~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=472fd5401561f94698f4c8f9dbbbfbf76ab55626;p=thirdparty%2Fkernel%2Fstable.git

Merge branch 'cleanup-hwmod' into cleanup

Conflicts:
	arch/arm/mach-omap2/dsp.c
---

472fd5401561f94698f4c8f9dbbbfbf76ab55626
diff --cc arch/arm/mach-omap2/dsp.c
index 88ffa1e645cd9,8b251a995abfa..a636ebc16b397
--- a/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