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/cm-x300.c | |
| parent | dfad549d98b60160547d1b8299051b9456c8da85 (diff) | |
| parent | 5f183860d5007ec76ea36bfa6c36d66e37f0dbcf (diff) | |
Merge branches 'fixes' and 'devel-stable' into for-linus
Diffstat (limited to 'arch/arm/mach-pxa/cm-x300.c')
| -rw-r--r-- | arch/arm/mach-pxa/cm-x300.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/cm-x300.c b/arch/arm/mach-pxa/cm-x300.c index bfca7ed2fea..7a8edba0dcd 100644 --- a/arch/arm/mach-pxa/cm-x300.c +++ b/arch/arm/mach-pxa/cm-x300.c | |||
| @@ -296,7 +296,7 @@ static struct pxafb_mach_info cm_x300_lcd = { | |||
| 296 | 296 | ||
| 297 | static void __init cm_x300_init_lcd(void) | 297 | static void __init cm_x300_init_lcd(void) |
| 298 | { | 298 | { |
| 299 | set_pxa_fb_info(&cm_x300_lcd); | 299 | pxa_set_fb_info(NULL, &cm_x300_lcd); |
| 300 | } | 300 | } |
| 301 | #else | 301 | #else |
| 302 | static inline void cm_x300_init_lcd(void) {} | 302 | static inline void cm_x300_init_lcd(void) {} |