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 branches 'x86-apic-for-linus', 'x86-asm-for-linus' and 'x86-cleanups-for-linus...
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
em-x270.c
diff --git
a/arch/arm/mach-pxa/em-x270.c
b/arch/arm/mach-pxa/em-x270.c
index
b411d7c
..
f8a6e9d
100644
(file)
--- a/
arch/arm/mach-pxa/em-x270.c
+++ b/
arch/arm/mach-pxa/em-x270.c
@@
-689,7
+689,7
@@
static struct pxafb_mach_info em_x270_lcd = {
static void __init em_x270_init_lcd(void)
{
-
set_pxa_fb_info(
&em_x270_lcd);
+
pxa_set_fb_info(NULL,
&em_x270_lcd);
}
#else
static inline void em_x270_init_lcd(void) {}