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 'next' of git://git.monstr.eu/linux-2.6-microblaze
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
mainstone.c
diff --git
a/arch/arm/mach-pxa/mainstone.c
b/arch/arm/mach-pxa/mainstone.c
index
29b6e7a
..
95163ba
100644
(file)
--- a/
arch/arm/mach-pxa/mainstone.c
+++ b/
arch/arm/mach-pxa/mainstone.c
@@
-592,7
+592,7
@@
static void __init mainstone_init(void)
else
mainstone_pxafb_info.modes = &toshiba_ltm035a776c_mode;
-
set_pxa_fb_info(
&mainstone_pxafb_info);
+
pxa_set_fb_info(NULL,
&mainstone_pxafb_info);
mainstone_backlight_register();
pxa_set_mci_info(&mainstone_mci_platform_data);