projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
drivers
/
video
/
cg6.c
diff --git
a/drivers/video/cg6.c
b/drivers/video/cg6.c
index
3545dec
..
70781fe
100644
(file)
--- a/
drivers/video/cg6.c
+++ b/
drivers/video/cg6.c
@@
-624,7
+624,7
@@
static void cg6_init_fix(struct fb_info *info, int linebytes)
default:
cg6_cpu_name = "i386";
break;
- }
;
+ }
if (((conf >> CG6_FHC_REV_SHIFT) & CG6_FHC_REV_MASK) >= 11) {
if (info->fix.smem_len <= 0x100000)
cg6_card_name = "TGX";
@@
-839,8
+839,6
@@
static int cg6_remove(struct platform_device *op)
framebuffer_release(info);
- dev_set_drvdata(&op->dev, NULL);
-
return 0;
}