diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-29 16:54:54 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-29 16:54:54 -0400 |
| commit | b43d151e9679a06df896ac3db65a9dca80040fed (patch) | |
| tree | ac0b71ef0a28f795700d85a8c8e23ba3fb6eef30 /arch/arm/mach-pxa/colibri-pxa3xx.c | |
| parent | dfad549d98b60160547d1b8299051b9456c8da85 (diff) | |
| parent | 5f183860d5007ec76ea36bfa6c36d66e37f0dbcf (diff) | |
Merge branches 'fixes' and 'devel-stable' into for-linus
Diffstat (limited to 'arch/arm/mach-pxa/colibri-pxa3xx.c')
| -rw-r--r-- | arch/arm/mach-pxa/colibri-pxa3xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/colibri-pxa3xx.c b/arch/arm/mach-pxa/colibri-pxa3xx.c index 96b2d9fbfef0..3f9be419959d 100644 --- a/arch/arm/mach-pxa/colibri-pxa3xx.c +++ b/arch/arm/mach-pxa/colibri-pxa3xx.c | |||
| @@ -105,7 +105,7 @@ void __init colibri_pxa3xx_init_lcd(int bl_pin) | |||
| 105 | lcd_bl_pin = bl_pin; | 105 | lcd_bl_pin = bl_pin; |
| 106 | gpio_request(bl_pin, "lcd backlight"); | 106 | gpio_request(bl_pin, "lcd backlight"); |
| 107 | gpio_direction_output(bl_pin, 0); | 107 | gpio_direction_output(bl_pin, 0); |
| 108 | set_pxa_fb_info(&sharp_lq43_info); | 108 | pxa_set_fb_info(NULL, &sharp_lq43_info); |
| 109 | } | 109 | } |
| 110 | #endif | 110 | #endif |
| 111 | 111 | ||