summaryrefslogtreecommitdiff
path: root/arch/arm/mach-pxa/colibri-pxa270-income.c
diff options
context:
space:
mode:
authorRussell King - ARM Linux <linux@arm.linux.org.uk>2011-02-15 10:37:30 +0300
committerEric Miao <eric.y.miao@gmail.com>2011-03-16 11:32:47 +0300
commit4321e1a12b811c02441240aa6183156791204f3f (patch)
tree9ac73db90d1a34dfcf5df2576f32155e03e225de /arch/arm/mach-pxa/colibri-pxa270-income.c
parent54a93b69a4341a14acb67e0bb19b9bf1cc878cb2 (diff)
downloadlinux-4321e1a12b811c02441240aa6183156791204f3f.tar.xz
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/colibri-pxa270-income.c')
-rw-r--r--arch/arm/mach-pxa/colibri-pxa270-income.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/colibri-pxa270-income.c b/arch/arm/mach-pxa/colibri-pxa270-income.c
index 07b62a096f17..c2f164bd515c 100644
--- a/arch/arm/mach-pxa/colibri-pxa270-income.c
+++ b/arch/arm/mach-pxa/colibri-pxa270-income.c
@@ -176,7 +176,7 @@ static struct pxafb_mach_info income_lcd_screen = {
static void __init income_lcd_init(void)
{
- set_pxa_fb_info(&income_lcd_screen);
+ pxa_set_fb_info(NULL, &income_lcd_screen);
}
#else
static inline void income_lcd_init(void) {}