From: Kevin Hilman <khilman@ti.com>
Date: Mon, 5 Mar 2012 23:37:04 +0000 (-0800)
Subject: Merge remote-tracking branch 'omap/hsmmc' into for_3.4/cleanup/pm-base
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=015f1e4297ad32f83251f3f4cee2389ce5516e9e;p=deliverable%2Flinux.git

Merge remote-tracking branch 'omap/hsmmc' into for_3.4/cleanup/pm-base
---

015f1e4297ad32f83251f3f4cee2389ce5516e9e
diff --cc arch/arm/mach-omap2/prm44xx.c
index f4c151989c91,a1d6154dc120..eac623c7c3d8
--- a/arch/arm/mach-omap2/prm44xx.c
+++ b/arch/arm/mach-omap2/prm44xx.c
@@@ -17,11 -17,11 +17,12 @@@
  #include <linux/err.h>
  #include <linux/io.h>
  
 -#include "common.h"
  #include <plat/cpu.h>
+ #include <plat/irqs.h>
  #include <plat/prcm.h>
  
 +#include "iomap.h"
 +#include "common.h"
  #include "vp.h"
  #include "prm44xx.h"
  #include "prm-regbits-44xx.h"