From: Tony Lindgren <tony@atomide.com>
Date: Thu, 15 May 2008 23:39:16 +0000 (-0700)
Subject: ARM: OMAP: Fix sdrc.h and powerdomain.c for assembly
X-Git-Tag: v2.6.26-omap1~123^2~103
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2d08510f1d9cbeefcb2eeb2622123933f497b28a;p=linux-2.6-omap-h63xx.git

ARM: OMAP: Fix sdrc.h and powerdomain.c for assembly

Fix sdrc.h and powerdomain.c for assembly

Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/mach-omap2/cm.h b/arch/arm/mach-omap2/cm.h
index 040ec8e57b3..c8e36921edf 100644
--- a/arch/arm/mach-omap2/cm.h
+++ b/arch/arm/mach-omap2/cm.h
@@ -14,8 +14,6 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/io.h>
-
 #include "prcm-common.h"
 
 #ifndef __ASSEMBLER__
diff --git a/arch/arm/mach-omap2/powerdomain.c b/arch/arm/mach-omap2/powerdomain.c
index 0a6caafe14c..94b16d00a8b 100644
--- a/arch/arm/mach-omap2/powerdomain.c
+++ b/arch/arm/mach-omap2/powerdomain.c
@@ -22,6 +22,7 @@
 #include <linux/list.h>
 #include <linux/errno.h>
 #include <linux/err.h>
+#include <linux/io.h>
 
 #include <asm/atomic.h>