git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v2.6.37-rc2' into sched/core
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
saar.c
diff --git
a/arch/arm/mach-pxa/saar.c
b/arch/arm/mach-pxa/saar.c
index
4b521e0
..
ffa50e6
100644
(file)
--- 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,