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 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
colibri-pxa270-income.c
diff --git
a/arch/arm/mach-pxa/colibri-pxa270-income.c
b/arch/arm/mach-pxa/colibri-pxa270-income.c
index
ee79739
..
44c1b77
100644
(file)
--- a/
arch/arm/mach-pxa/colibri-pxa270-income.c
+++ b/
arch/arm/mach-pxa/colibri-pxa270-income.c
@@
-175,7
+175,7
@@
static struct pxafb_mach_info income_lcd_screen = {
static void __init income_lcd_init(void)
{
-
set_pxa_fb_info(
&income_lcd_screen);
+
pxa_set_fb_info(NULL,
&income_lcd_screen);
}
#else
static inline void income_lcd_init(void) {}