Index: linux-2.6.15-rc2/arch/arm/mach-pxa/corgi_pm.c
===================================================================
--- linux-2.6.15-rc2.orig/arch/arm/mach-pxa/corgi_pm.c	2006-01-06 17:11:21.000000000 +0000
+++ linux-2.6.15-rc2/arch/arm/mach-pxa/corgi_pm.c	2006-01-06 23:56:29.000000000 +0000
@@ -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>
Index: linux-2.6.15-rc2/arch/arm/mach-pxa/sharpsl.h
===================================================================
--- linux-2.6.15-rc2.orig/arch/arm/mach-pxa/sharpsl.h	2006-01-06 17:11:06.000000000 +0000
+++ linux-2.6.15-rc2/arch/arm/mach-pxa/sharpsl.h	2006-01-06 23:55:17.000000000 +0000
@@ -7,6 +7,7 @@
  *
  */
 
+#include <asm/hardware/sharpsl_pm.h>
 
 /*
  * SharpSL SSP Driver
Index: linux-2.6.15-rc2/arch/arm/mach-pxa/sharpsl_pm.c
===================================================================
--- linux-2.6.15-rc2.orig/arch/arm/mach-pxa/sharpsl_pm.c	2006-01-06 17:11:06.000000000 +0000
+++ linux-2.6.15-rc2/arch/arm/mach-pxa/sharpsl_pm.c	2006-01-06 23:55:43.000000000 +0000
@@ -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[] = {
Index: linux-2.6.15-rc2/arch/arm/mach-pxa/spitz_pm.c
===================================================================
--- linux-2.6.15-rc2.orig/arch/arm/mach-pxa/spitz_pm.c	2006-01-06 17:11:06.000000000 +0000
+++ linux-2.6.15-rc2/arch/arm/mach-pxa/spitz_pm.c	2006-01-06 23:56:22.000000000 +0000
@@ -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>