summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/magician.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-03-26 11:03:03 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-03-26 11:03:03 +0100
commit938c0ace3ffb8cc2073a6d2e68fa7a6ab7cb471e (patch)
tree9257bdba52ce88ca0a0c2f6fce1f59a1eb278452 /arch/arm/mach-pxa/magician.c
parentMerge branch 'syscore' of git://git.kernel.org/pub/scm/linux/kernel/git/rafae... (diff)
parentARM: pxa/am300epd: fix leak in am300_init_gpio_regs error path (diff)
downloadlinux-938c0ace3ffb8cc2073a6d2e68fa7a6ab7cb471e.tar.xz
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/magician.c')
-rw-r--r--arch/arm/mach-pxa/magician.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c
index 5535991c4a3c..a72993dde2b3 100644
--- a/arch/arm/mach-pxa/magician.c
+++ b/arch/arm/mach-pxa/magician.c
@@ -757,7 +757,7 @@ static void __init magician_init(void)
gpio_direction_output(GPIO104_MAGICIAN_LCD_POWER_1, 0);
gpio_direction_output(GPIO105_MAGICIAN_LCD_POWER_2, 0);
gpio_direction_output(GPIO106_MAGICIAN_LCD_POWER_3, 0);
- set_pxa_fb_info(lcd_select ? &samsung_info : &toppoly_info);
+ pxa_set_fb_info(NULL, lcd_select ? &samsung_info : &toppoly_info);
} else
pr_err("LCD detection: CPLD mapping failed\n");
}