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 'viafb-next' of git://github.com/schandinat/linux-2.6 into fbdev-fixes...
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
cm-x2xx.c
diff --git
a/arch/arm/mach-pxa/cm-x2xx.c
b/arch/arm/mach-pxa/cm-x2xx.c
index
b734d84
..
8225e2e
100644
(file)
--- a/
arch/arm/mach-pxa/cm-x2xx.c
+++ b/
arch/arm/mach-pxa/cm-x2xx.c
@@
-379,7
+379,7
@@
__setup("monitor=", cmx2xx_set_display);
static void __init cmx2xx_init_display(void)
{
-
set_pxa_fb_info(
cmx2xx_display);
+
pxa_set_fb_info(NULL,
cmx2xx_display);
}
#else
static inline void cmx2xx_init_display(void) {}