From 2a4fd4a098d839fcfc2d9ef4516ef093c740c65a Mon Sep 17 00:00:00 2001
From: Ryan Mallon <rmallon@gmail.com>
Date: Wed, 11 Jan 2012 13:14:20 +1100
Subject: [PATCH] --- yaml --- r: 295737 b: refs/heads/master c:
 a6de3df4f172e124280d88e617ee7d29f7af970b h: refs/heads/master i:   295735:
 059913e5a46e1a645f16d0fb4382a28a22275225 v: v3

---
 [refs]                                             | 2 +-
 trunk/arch/arm/mach-ep93xx/crunch.c                | 2 +-
 trunk/arch/arm/mach-ep93xx/include/mach/hardware.h | 1 -
 trunk/arch/arm/mach-ep93xx/soc.h                   | 2 ++
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6bada93735b5..2fd08eadbb46 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9aeec63e048936f92ad2792ffc8cc66ef0303e0f
+refs/heads/master: a6de3df4f172e124280d88e617ee7d29f7af970b
diff --git a/trunk/arch/arm/mach-ep93xx/crunch.c b/trunk/arch/arm/mach-ep93xx/crunch.c
index d05ed0be4a65..74753e2df603 100644
--- a/trunk/arch/arm/mach-ep93xx/crunch.c
+++ b/trunk/arch/arm/mach-ep93xx/crunch.c
@@ -16,7 +16,7 @@
 #include <linux/sched.h>
 #include <linux/init.h>
 #include <linux/io.h>
-#include <mach/ep93xx-regs.h>
+
 #include <asm/thread_notify.h>
 
 #include "soc.h"
diff --git a/trunk/arch/arm/mach-ep93xx/include/mach/hardware.h b/trunk/arch/arm/mach-ep93xx/include/mach/hardware.h
index 4df842897eae..efcd47815a91 100644
--- a/trunk/arch/arm/mach-ep93xx/include/mach/hardware.h
+++ b/trunk/arch/arm/mach-ep93xx/include/mach/hardware.h
@@ -5,7 +5,6 @@
 #ifndef __ASM_ARCH_HARDWARE_H
 #define __ASM_ARCH_HARDWARE_H
 
-#include <mach/ep93xx-regs.h>
 #include <mach/platform.h>
 
 /*
diff --git a/trunk/arch/arm/mach-ep93xx/soc.h b/trunk/arch/arm/mach-ep93xx/soc.h
index d9b01a7f3241..979fba722926 100644
--- a/trunk/arch/arm/mach-ep93xx/soc.h
+++ b/trunk/arch/arm/mach-ep93xx/soc.h
@@ -13,6 +13,8 @@
 #ifndef _EP93XX_SOC_H
 #define _EP93XX_SOC_H
 
+#include <mach/ep93xx-regs.h>
+
 /*
  * EP93xx Physical Memory Map:
  *