diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
| commit | fac56c2df51bc29b07b3c2dcfabf32a015a0522c (patch) | |
| tree | 1ff5d84ecf4ea0bcbd42e2ef9624b5ade3810890 /arch/arm/mach-pxa/saar.c | |
| parent | 6caa15d0b84d2ea688fd31f4f172c8353463e109 (diff) | |
| parent | a6360dd37e1a144ed11e6548371bade559a1e4df (diff) | |
Merge commit 'v2.6.39-rc3' into for-2.6.39
Diffstat (limited to 'arch/arm/mach-pxa/saar.c')
| -rw-r--r-- | arch/arm/mach-pxa/saar.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/saar.c b/arch/arm/mach-pxa/saar.c index eb83c89428ef..fee97a935122 100644 --- a/arch/arm/mach-pxa/saar.c +++ b/arch/arm/mach-pxa/saar.c | |||
| @@ -473,7 +473,7 @@ static struct pxafb_mach_info saar_lcd_info = { | |||
| 473 | 473 | ||
| 474 | static void __init saar_init_lcd(void) | 474 | static void __init saar_init_lcd(void) |
| 475 | { | 475 | { |
| 476 | set_pxa_fb_info(&saar_lcd_info); | 476 | pxa_set_fb_info(NULL, &saar_lcd_info); |
| 477 | } | 477 | } |
| 478 | #else | 478 | #else |
| 479 | static inline void saar_init_lcd(void) {} | 479 | static inline void saar_init_lcd(void) {} |