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 branch 'topic/lola' into for-linus
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
spitz.c
diff --git
a/arch/arm/mach-pxa/spitz.c
b/arch/arm/mach-pxa/spitz.c
index
38e2c09
..
01c5769
100644
(file)
--- a/
arch/arm/mach-pxa/spitz.c
+++ b/
arch/arm/mach-pxa/spitz.c
@@
-724,7
+724,7
@@
static struct pxafb_mach_info spitz_pxafb_info = {
static void __init spitz_lcd_init(void)
{
static void __init spitz_lcd_init(void)
{
-
set_pxa_fb_info(
&spitz_pxafb_info);
+
pxa_set_fb_info(NULL,
&spitz_pxafb_info);
}
#else
static inline void spitz_lcd_init(void) {}
}
#else
static inline void spitz_lcd_init(void) {}