diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-05-31 00:14:26 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-31 00:14:26 -0400 |
| commit | d5b732b17ca2fc74f370bdba5aae6c804fac8c35 (patch) | |
| tree | 4facc6d96116b032a3c1cb2ced9b2a3008e9216e /drivers/video/vfb.c | |
| parent | eb6e8605ee5f5b4e116451bf01b3f35eac446dde (diff) | |
| parent | 67a3e12b05e055c0415c556a315a3d3eb637e29e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/video/vfb.c')
| -rw-r--r-- | drivers/video/vfb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/vfb.c b/drivers/video/vfb.c index 9b5532b4de35..bc67251f1a2f 100644 --- a/drivers/video/vfb.c +++ b/drivers/video/vfb.c | |||
| @@ -78,7 +78,7 @@ static void rvfree(void *mem, unsigned long size) | |||
| 78 | vfree(mem); | 78 | vfree(mem); |
| 79 | } | 79 | } |
| 80 | 80 | ||
| 81 | static struct fb_var_screeninfo vfb_default __initdata = { | 81 | static struct fb_var_screeninfo vfb_default __devinitdata = { |
| 82 | .xres = 640, | 82 | .xres = 640, |
| 83 | .yres = 480, | 83 | .yres = 480, |
| 84 | .xres_virtual = 640, | 84 | .xres_virtual = 640, |
| @@ -100,7 +100,7 @@ static struct fb_var_screeninfo vfb_default __initdata = { | |||
| 100 | .vmode = FB_VMODE_NONINTERLACED, | 100 | .vmode = FB_VMODE_NONINTERLACED, |
| 101 | }; | 101 | }; |
| 102 | 102 | ||
| 103 | static struct fb_fix_screeninfo vfb_fix __initdata = { | 103 | static struct fb_fix_screeninfo vfb_fix __devinitdata = { |
| 104 | .id = "Virtual FB", | 104 | .id = "Virtual FB", |
| 105 | .type = FB_TYPE_PACKED_PIXELS, | 105 | .type = FB_TYPE_PACKED_PIXELS, |
| 106 | .visual = FB_VISUAL_PSEUDOCOLOR, | 106 | .visual = FB_VISUAL_PSEUDOCOLOR, |