diff options
author | Russell King - ARM Linux <linux@arm.linux.org.uk> | 2011-02-15 15:37:30 +0800 |
---|---|---|
committer | Eric Miao <eric.y.miao@gmail.com> | 2011-03-16 16:32:47 +0800 |
commit | 4321e1a12b811c02441240aa6183156791204f3f (patch) | |
tree | 9ac73db90d1a34dfcf5df2576f32155e03e225de /arch/arm/mach-pxa/cm-x300.c | |
parent | 54a93b69a4341a14acb67e0bb19b9bf1cc878cb2 (diff) | |
download | talos-obmc-linux-4321e1a12b811c02441240aa6183156791204f3f.tar.gz talos-obmc-linux-4321e1a12b811c02441240aa6183156791204f3f.zip |
ARM: pxa: clean up set_pxa_fb_info
set_pxa_fb_info() has been a long-standing wart in the naming scheme
of the pxa_set_xxx_info() functions. This renames the function, and
combines set_pxa_fb_parent() with set_pxa_fb_info().
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
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 7984268508b6..0c9cfbce4bff 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 = { static void __init cm_x300_init_lcd(void) { - set_pxa_fb_info(&cm_x300_lcd); + pxa_set_fb_info(NULL, &cm_x300_lcd); } #else static inline void cm_x300_init_lcd(void) {} |