From 25df222ba3cd2383e846e216970d77b07e593696 Mon Sep 17 00:00:00 2001 From: zyw Date: Mon, 30 May 2011 10:57:59 +0800 Subject: [PATCH] rename charge logo api --- drivers/video/fbmem.c | 2 +- drivers/video/rk29_fb.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c index 5be877edd6c3..6955151c5a0d 100755 --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c @@ -329,7 +329,7 @@ static struct logo_data { const struct linux_logo *logo; } fb_logo __read_mostly; -void show_charge_logo(struct linux_logo *logo) +void fb_show_charge_logo(struct linux_logo *logo) { fb_logo.logo = logo; return; diff --git a/drivers/video/rk29_fb.c b/drivers/video/rk29_fb.c index 36d32eae3a6a..2bc6c7783574 100755 --- a/drivers/video/rk29_fb.c +++ b/drivers/video/rk29_fb.c @@ -2393,7 +2393,7 @@ static struct suspend_info suspend_info = { .early_suspend.level = EARLY_SUSPEND_LEVEL_DISABLE_FB, }; #endif -struct fb_info *g_inf = NULL; //add cym@rk 20101027 for charger logo +struct fb_info *g_fb0_inf = NULL; //add cym@rk 20101027 for charger logo static int __init rk29fb_probe (struct platform_device *pdev) { struct rk29fb_inf *inf = NULL; @@ -2525,7 +2525,7 @@ static int __init rk29fb_probe (struct platform_device *pdev) if (ret < 0) goto release_cmap; - g_inf = inf->fb0; //add cym@rk 20101027 + g_fb0_inf = inf->fb0; //add cym@rk 20101027 /* alloc win1 buf */ res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "win1 buf"); -- 2.34.1