diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-29 22:54:54 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-29 22:54:54 +0200 |
| commit | b43d151e9679a06df896ac3db65a9dca80040fed (patch) | |
| tree | ac0b71ef0a28f795700d85a8c8e23ba3fb6eef30 /arch/arm/mach-pxa/trizeps4.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 dev... (diff) | |
| download | linux-b43d151e9679a06df896ac3db65a9dca80040fed.tar.xz linux-b43d151e9679a06df896ac3db65a9dca80040fed.zip | |
Merge branches 'fixes' and 'devel-stable' into for-linus
Diffstat (limited to 'arch/arm/mach-pxa/trizeps4.c')
| -rw-r--r-- | arch/arm/mach-pxa/trizeps4.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c index 857bb2e63486..b9cfbebdfe9c 100644 --- a/arch/arm/mach-pxa/trizeps4.c +++ b/arch/arm/mach-pxa/trizeps4.c @@ -516,9 +516,9 @@ static void __init trizeps4_init(void) pxa_set_stuart_info(NULL); if (0) /* dont know how to determine LCD */ - set_pxa_fb_info(&sharp_lcd); + pxa_set_fb_info(NULL, &sharp_lcd); else - set_pxa_fb_info(&toshiba_lcd); + pxa_set_fb_info(NULL, &toshiba_lcd); pxa_set_mci_info(&trizeps4_mci_platform_data); #ifndef STATUS_LEDS_ON_STUART_PINS |