projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a9fadb5
)
workround for DS1006H temporily,DS1006H use lcdc1 as primary display device
author
yxj
<yxj@rock-chips.com>
Mon, 31 Dec 2012 02:54:18 +0000
(10:54 +0800)
committer
yxj
<yxj@rock-chips.com>
Mon, 31 Dec 2012 02:54:18 +0000
(10:54 +0800)
drivers/video/rockchip/rk_fb.c
patch
|
blob
|
history
diff --git
a/drivers/video/rockchip/rk_fb.c
b/drivers/video/rockchip/rk_fb.c
index 9bbd3af95437e4a1656b45b6f4e350fa0385243c..cfc3e6e7730d7b39d1a9a9b4da2e90a253d2f451 100644
(file)
--- a/
drivers/video/rockchip/rk_fb.c
+++ b/
drivers/video/rockchip/rk_fb.c
@@
-1175,7
+1175,9
@@
int rk_fb_register(struct rk_lcdc_device_driver *dev_drv,
}
#if !defined(CONFIG_FRAMEBUFFER_CONSOLE) && defined(CONFIG_LOGO)
+#if !defined(CONFIG_MACH_RK3168_DS1006H)
if(id == 0)
+#endif
{
fb_inf->fb[0]->fbops->fb_open(fb_inf->fb[0],1);
dev_drv->load_screen(dev_drv,1);