summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2006-01-07 11:12:26 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-01-07 11:12:26 +0000
commit2c041f4b9be5cecbd0a042ecd9122a9db6f50416 (patch)
tree25dca940da091b0426f067338f235e651ac99e07
parentf99c89297cd6995ccad6394c87383941c2570fe9 (diff)
downloadblackbird-op-linux-2c041f4b9be5cecbd0a042ecd9122a9db6f50416.tar.gz
blackbird-op-linux-2c041f4b9be5cecbd0a042ecd9122a9db6f50416.zip
[ARM] 3235/1: SharpSL PM: Fix a gcc4 build error
Patch from Richard Purdie Fix a gcc4 build error (incomplete element type) in the pxa SharpSL PM code. Signed-off-by: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mach-pxa/corgi_pm.c1
-rw-r--r--arch/arm/mach-pxa/sharpsl.h1
-rw-r--r--arch/arm/mach-pxa/sharpsl_pm.c1
-rw-r--r--arch/arm/mach-pxa/spitz_pm.c1
4 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/corgi_pm.c b/arch/arm/mach-pxa/corgi_pm.c
index de8b2403c929..7a1ab73e9e10 100644
--- a/arch/arm/mach-pxa/corgi_pm.c
+++ b/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/arch/arm/mach-pxa/sharpsl.h b/arch/arm/mach-pxa/sharpsl.h
index 92b793050509..da4769caaf72 100644
--- a/arch/arm/mach-pxa/sharpsl.h
+++ b/arch/arm/mach-pxa/sharpsl.h
@@ -7,6 +7,7 @@
*
*/
+#include <asm/hardware/sharpsl_pm.h>
/*
* SharpSL SSP Driver
diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c
index f6fefb181411..6d402b262d8a 100644
--- a/arch/arm/mach-pxa/sharpsl_pm.c
+++ b/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/arch/arm/mach-pxa/spitz_pm.c b/arch/arm/mach-pxa/spitz_pm.c
index 76a5c26dea0b..5e5bdc898482 100644
--- a/arch/arm/mach-pxa/spitz_pm.c
+++ b/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>
OpenPOWER on IntegriCloud