diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-11-07 16:11:20 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-11-07 16:11:20 +0000 |
| commit | 261ca205817deb3d3dfd0be218cc0154be8e6472 (patch) | |
| tree | 6f1e6671e751db90c196ecf4ef0a3041081f308d /arch/arm/mach-pxa/saar.c | |
| parent | 725278e0ecdabbbced6f1b05a23473ec9e4cafee (diff) | |
| parent | 72feb6e7cb55e7947653446e52e54d66134ac1b5 (diff) | |
| download | lwn-261ca205817deb3d3dfd0be218cc0154be8e6472.tar.gz lwn-261ca205817deb3d3dfd0be218cc0154be8e6472.zip | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
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 = { }, }; -#if defined(CONFIG_FB_PXA) || (CONFIG_FB_PXA_MODULE) +#if defined(CONFIG_FB_PXA) || defined(CONFIG_FB_PXA_MODULE) static uint16_t lcd_power_on[] = { /* single frame */ SMART_CMD_NOOP, |