rk3066B lcdc: add AXI_MS_ID config,fix stanby issue

[firefly-linux-kernel-4.4.55.git] / drivers / video / fbmem.c

diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
old mode 100644 (file)
new mode 100755 (executable)
index 7a41220..ae7c421
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -354,6 +354,12 @@ static struct logo_data {
        const struct linux_logo *logo;
 } fb_logo __read_mostly;
 
+void fb_show_charge_logo(struct linux_logo *logo)
+{
+       fb_logo.logo = logo;
+       return;
+}
+
 static void fb_rotate_logo_ud(const u8 *in, u8 *out, u32 width, u32 height)
 {
        u32 size = width * height, i;
@@ -1050,6 +1056,7 @@ fb_blank(struct fb_info *info, int blank)
 
        return ret;
 }
+int fb_vaddr = 0;
 
 static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
                        unsigned long arg)