Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 2c041f4b9be5cecbd0a042ecd9122a9db6f50416

Authored by Richard Purdie
Committed by Russell King
1 parent f99c89297c
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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>

Showing 4 changed files with 1 additions and 3 deletions Side-by-side Diff

arch/arm/mach-pxa/corgi_pm.c
Diff comments   View file @ 2c041f4
... ... @@ -21,7 +21,6 @@
21 21 #include <asm/mach-types.h>
22 22 #include <asm/hardware.h>
23 23 #include <asm/hardware/scoop.h>
24   -#include <asm/hardware/sharpsl_pm.h>
25 24  
26 25 #include <asm/arch/sharpsl.h>
27 26 #include <asm/arch/corgi.h>
arch/arm/mach-pxa/sharpsl.h
Diff comments   View file @ 2c041f4
... ... @@ -7,6 +7,7 @@
7 7 *
8 8 */
9 9  
  10 +#include <asm/hardware/sharpsl_pm.h>
10 11  
11 12 /*
12 13 * SharpSL SSP Driver
arch/arm/mach-pxa/sharpsl_pm.c
Diff comments   View file @ 2c041f4
... ... @@ -27,7 +27,6 @@
27 27 #include <asm/arch/pm.h>
28 28 #include <asm/arch/pxa-regs.h>
29 29 #include <asm/arch/sharpsl.h>
30   -#include <asm/hardware/sharpsl_pm.h>
31 30 #include "sharpsl.h"
32 31  
33 32 struct battery_thresh spitz_battery_levels_acin[] = {
arch/arm/mach-pxa/spitz_pm.c
Diff comments   View file @ 2c041f4
... ... @@ -21,7 +21,6 @@
21 21 #include <asm/mach-types.h>
22 22 #include <asm/hardware.h>
23 23 #include <asm/hardware/scoop.h>
24   -#include <asm/hardware/sharpsl_pm.h>
25 24  
26 25 #include <asm/arch/sharpsl.h>
27 26 #include <asm/arch/spitz.h>