diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-11-30 00:55:11 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-30 00:55:11 -0500 |
| commit | 7d0dbea312a6508389241b4fb6cda1c4d1e32d6e (patch) | |
| tree | f23b591e8c6f921c91fce00a6453d4087ec3c071 /arch/arm/mach-pxa/saar.c | |
| parent | 5c4986b8a9ddd9cf649abe38a102866f7809b1d2 (diff) | |
| parent | 193006f7e3b1abd42d7a3677b54fa2996461a842 (diff) | |
Merge branch 'sh/urgent' into sh-latest
Diffstat (limited to 'arch/arm/mach-pxa/saar.c')
| -rw-r--r-- | arch/arm/mach-pxa/saar.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/saar.c b/arch/arm/mach-pxa/saar.c index 4b521e045d75..ffa50e633ee6 100644 --- a/arch/arm/mach-pxa/saar.c +++ b/arch/arm/mach-pxa/saar.c | |||
| @@ -116,7 +116,7 @@ static struct platform_device smc91x_device = { | |||
| 116 | }, | 116 | }, |
| 117 | }; | 117 | }; |
| 118 | 118 | ||
| 119 | #if defined(CONFIG_FB_PXA) || (CONFIG_FB_PXA_MODULE) | 119 | #if defined(CONFIG_FB_PXA) || defined(CONFIG_FB_PXA_MODULE) |
| 120 | static uint16_t lcd_power_on[] = { | 120 | static uint16_t lcd_power_on[] = { |
| 121 | /* single frame */ | 121 | /* single frame */ |
| 122 | SMART_CMD_NOOP, | 122 | SMART_CMD_NOOP, |