From: Olof Johansson <olof@lixom.net>
Date: Thu, 13 Dec 2012 00:10:45 +0000 (-0800)
Subject: ARM: arm-soc: Merge branch 'next/pm2' into next/pm
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9c7466b217af784280d9fc841bbd559ef3bf33e9;p=linux.git

ARM: arm-soc: Merge branch 'next/pm2' into next/pm

Another smaller branch merged into next/pm before pull request.

Signed-off-by: Olof Johansson <olof@lixom.net>
---

9c7466b217af784280d9fc841bbd559ef3bf33e9
diff --cc arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index d6700d3ddd042,219fb075741bb..ce1661d18e56d
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@@ -21,11 -21,11 +21,12 @@@
  #include <linux/io.h>
  #include <linux/platform_data/gpio-omap.h>
  #include <linux/power/smartreflex.h>
 +#include <linux/platform_data/omap_ocp2scp.h>
  #include <linux/i2c-omap.h>
  
- #include <plat-omap/dma-omap.h>
+ #include <linux/omap-dma.h>
  
+ #include <linux/platform_data/omap_ocp2scp.h>
  #include <linux/platform_data/spi-omap2-mcspi.h>
  #include <linux/platform_data/asoc-ti-mcbsp.h>
  #include <plat/dmtimer.h>