diff options
author | Russell King | 2011-03-26 11:03:03 +0100 |
---|---|---|
committer | Russell King | 2011-03-26 11:03:03 +0100 |
commit | 938c0ace3ffb8cc2073a6d2e68fa7a6ab7cb471e (patch) | |
tree | 9257bdba52ce88ca0a0c2f6fce1f59a1eb278452 /arch/arm/mach-pxa/saar.c | |
parent | Merge branch 'syscore' of git://git.kernel.org/pub/scm/linux/kernel/git/rafae... (diff) | |
parent | ARM: pxa/am300epd: fix leak in am300_init_gpio_regs error path (diff) | |
download | kernel-qcow2-linux-938c0ace3ffb8cc2073a6d2e68fa7a6ab7cb471e.tar.gz kernel-qcow2-linux-938c0ace3ffb8cc2073a6d2e68fa7a6ab7cb471e.tar.xz kernel-qcow2-linux-938c0ace3ffb8cc2073a6d2e68fa7a6ab7cb471e.zip |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
Conflicts:
arch/arm/mach-pxa/tosa.c
Diffstat (limited to 'arch/arm/mach-pxa/saar.c')
-rw-r--r-- | arch/arm/mach-pxa/saar.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/saar.c b/arch/arm/mach-pxa/saar.c index eb83c89428ef..fee97a935122 100644 --- a/arch/arm/mach-pxa/saar.c +++ b/arch/arm/mach-pxa/saar.c @@ -473,7 +473,7 @@ static struct pxafb_mach_info saar_lcd_info = { static void __init saar_init_lcd(void) { - set_pxa_fb_info(&saar_lcd_info); + pxa_set_fb_info(NULL, &saar_lcd_info); } #else static inline void saar_init_lcd(void) {} |