diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-29 21:54:54 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-29 21:54:54 +0100 |
commit | b43d151e9679a06df896ac3db65a9dca80040fed (patch) | |
tree | ac0b71ef0a28f795700d85a8c8e23ba3fb6eef30 /arch/arm/mach-pxa/littleton.c | |
parent | ARM: 6826/1: Merge v6 and v7 DEBUG_LL DCC support (diff) | |
parent | Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable (diff) | |
download | linux-dev-b43d151e9679a06df896ac3db65a9dca80040fed.tar.xz linux-dev-b43d151e9679a06df896ac3db65a9dca80040fed.zip |
Merge branches 'fixes' and 'devel-stable' into for-linus
Diffstat (limited to 'arch/arm/mach-pxa/littleton.c')
-rw-r--r-- | arch/arm/mach-pxa/littleton.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/littleton.c b/arch/arm/mach-pxa/littleton.c index 87c1ed9ccd2f..e5e326d2cdc9 100644 --- a/arch/arm/mach-pxa/littleton.c +++ b/arch/arm/mach-pxa/littleton.c @@ -185,7 +185,7 @@ static struct pxafb_mach_info littleton_lcd_info = { static void littleton_init_lcd(void) { - set_pxa_fb_info(&littleton_lcd_info); + pxa_set_fb_info(NULL, &littleton_lcd_info); } #else static inline void littleton_init_lcd(void) {}; |