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.39-rc6' into x86/cleanups
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
zeus.c
diff --git
a/arch/arm/mach-pxa/zeus.c
b/arch/arm/mach-pxa/zeus.c
index
139aa7f
..
00363c7
100644
(file)
--- a/
arch/arm/mach-pxa/zeus.c
+++ b/
arch/arm/mach-pxa/zeus.c
@@
-847,7
+847,7
@@
static void __init zeus_init(void)
if (zeus_setup_fb_gpios())
pr_err("Failed to setup fb gpios\n");
else
-
set_pxa_fb_info(
&zeus_fb_info);
+
pxa_set_fb_info(NULL,
&zeus_fb_info);
pxa_set_mci_info(&zeus_mci_platform_data);
pxa_set_udc_info(&zeus_udc_info);