---

yaml --- r: 16767 b: refs/heads/master c: 2c041f4 h: refs/heads/master i: 16765: 6921a85 16763: d622a9d 16759: abfa9b7 16751: fe8e640 16735: 54e15f3 16703: b1af8e3 16639: 2936ac8 v: v3
git-mirror · Jan 7, 2006 · cbc6674 · cbc6674
1 parent 57e0b37
commit cbc6674
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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>
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,7 @@ @@
      *
      */
+    #include <asm/hardware/sharpsl_pm.h>
     /*
      * SharpSL SSP Driver
@@ Expand Down @@