From cbc6674aadbd3e7458b5977b527d7a01bb8224a9 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Sat, 7 Jan 2006 11:12:26 +0000
Subject: [PATCH] --- yaml --- r: 16767 b: refs/heads/master c:
 2c041f4b9be5cecbd0a042ecd9122a9db6f50416 h: refs/heads/master i:   16765:
 6921a8579b0a3d58a5678e1acd119bc896169eaf   16763:
 d622a9d3c0cb8268a55d3ea1dac8037de6f7714c   16759:
 abfa9b76ef53c3fff5447602b3eb1db7acb9fb95   16751:
 fe8e6408eaabd4d326bac74e0c6a4c46e776c2e6   16735:
 54e15f388d71f337405d082bc69a1ffd7a77b2df   16703:
 b1af8e347ce485d6889e63ae1464b86a3e9403ec   16639:
 2936ac8872b48c45416818f0edd445970e904277 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/arm/mach-pxa/corgi_pm.c   | 1 -
 trunk/arch/arm/mach-pxa/sharpsl.h    | 1 +
 trunk/arch/arm/mach-pxa/sharpsl_pm.c | 1 -
 trunk/arch/arm/mach-pxa/spitz_pm.c   | 1 -
 5 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 63a2a37a5416..98e11480002b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f99c89297cd6995ccad6394c87383941c2570fe9
+refs/heads/master: 2c041f4b9be5cecbd0a042ecd9122a9db6f50416
diff --git a/trunk/arch/arm/mach-pxa/corgi_pm.c b/trunk/arch/arm/mach-pxa/corgi_pm.c
index de8b2403c929..7a1ab73e9e10 100644
--- a/trunk/arch/arm/mach-pxa/corgi_pm.c
+++ b/trunk/arch/arm/mach-pxa/corgi_pm.c
@@ -21,7 +21,6 @@
 #include <asm/mach-types.h>
 #include <asm/hardware.h>
 #include <asm/hardware/scoop.h>
-#include <asm/hardware/sharpsl_pm.h>
 
 #include <asm/arch/sharpsl.h>
 #include <asm/arch/corgi.h>
diff --git a/trunk/arch/arm/mach-pxa/sharpsl.h b/trunk/arch/arm/mach-pxa/sharpsl.h
index 92b793050509..da4769caaf72 100644
--- a/trunk/arch/arm/mach-pxa/sharpsl.h
+++ b/trunk/arch/arm/mach-pxa/sharpsl.h
@@ -7,6 +7,7 @@
  *
  */
 
+#include <asm/hardware/sharpsl_pm.h>
 
 /*
  * SharpSL SSP Driver
diff --git a/trunk/arch/arm/mach-pxa/sharpsl_pm.c b/trunk/arch/arm/mach-pxa/sharpsl_pm.c
index f6fefb181411..6d402b262d8a 100644
--- a/trunk/arch/arm/mach-pxa/sharpsl_pm.c
+++ b/trunk/arch/arm/mach-pxa/sharpsl_pm.c
@@ -27,7 +27,6 @@
 #include <asm/arch/pm.h>
 #include <asm/arch/pxa-regs.h>
 #include <asm/arch/sharpsl.h>
-#include <asm/hardware/sharpsl_pm.h>
 #include "sharpsl.h"
 
 struct battery_thresh spitz_battery_levels_acin[] = {
diff --git a/trunk/arch/arm/mach-pxa/spitz_pm.c b/trunk/arch/arm/mach-pxa/spitz_pm.c
index 76a5c26dea0b..5e5bdc898482 100644
--- a/trunk/arch/arm/mach-pxa/spitz_pm.c
+++ b/trunk/arch/arm/mach-pxa/spitz_pm.c
@@ -21,7 +21,6 @@
 #include <asm/mach-types.h>
 #include <asm/hardware.h>
 #include <asm/hardware/scoop.h>
-#include <asm/hardware/sharpsl_pm.h>
 
 #include <asm/arch/sharpsl.h>
 #include <asm/arch/spitz.h>