diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-26 06:03:03 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-26 06:03:03 -0400 |
| commit | 938c0ace3ffb8cc2073a6d2e68fa7a6ab7cb471e (patch) | |
| tree | 9257bdba52ce88ca0a0c2f6fce1f59a1eb278452 /arch/arm/mach-pxa/balloon3.c | |
| parent | 16c29dafcc86024048f1dbb8349d31cb22c7c55a (diff) | |
| parent | 5898eb79fb45d4fd4ce22139c168de937bfaab38 (diff) | |
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/balloon3.c')
| -rw-r--r-- | arch/arm/mach-pxa/balloon3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/balloon3.c b/arch/arm/mach-pxa/balloon3.c index d2af73321dae..c6661b1d30b2 100644 --- a/arch/arm/mach-pxa/balloon3.c +++ b/arch/arm/mach-pxa/balloon3.c | |||
| @@ -263,7 +263,7 @@ static void __init balloon3_lcd_init(void) | |||
| 263 | } | 263 | } |
| 264 | 264 | ||
| 265 | balloon3_lcd_screen.pxafb_backlight_power = balloon3_backlight_power; | 265 | balloon3_lcd_screen.pxafb_backlight_power = balloon3_backlight_power; |
| 266 | set_pxa_fb_info(&balloon3_lcd_screen); | 266 | pxa_set_fb_info(NULL, &balloon3_lcd_screen); |
| 267 | return; | 267 | return; |
| 268 | 268 | ||
| 269 | err2: | 269 | err2: |