diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-26 00:25:02 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-26 00:25:02 -0500 |
commit | 8f5f90a872c38b4e78f3cc95e8a25434b98e4db2 (patch) | |
tree | 36c50b0c97286ab89c85016f7ab281f8e843c05c /drivers/video/dnfb.c | |
parent | c0cd2da16b431a2007ea83865f3dd1530c1643a5 (diff) | |
parent | 949db153b6466c6f7cad5a427ecea94985927311 (diff) |
Merge 3.8-rc5 into staging-next
This resolves a merge issue with a iio driver, and the zram code.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/video/dnfb.c')
-rw-r--r-- | drivers/video/dnfb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/dnfb.c b/drivers/video/dnfb.c index 49e3dda1a361..3526899da61b 100644 --- a/drivers/video/dnfb.c +++ b/drivers/video/dnfb.c | |||
@@ -115,7 +115,7 @@ static struct fb_ops dn_fb_ops = { | |||
115 | .fb_imageblit = cfb_imageblit, | 115 | .fb_imageblit = cfb_imageblit, |
116 | }; | 116 | }; |
117 | 117 | ||
118 | struct fb_var_screeninfo dnfb_var __devinitdata = { | 118 | struct fb_var_screeninfo dnfb_var = { |
119 | .xres = 1280, | 119 | .xres = 1280, |
120 | .yres = 1024, | 120 | .yres = 1024, |
121 | .xres_virtual = 2048, | 121 | .xres_virtual = 2048, |
@@ -126,7 +126,7 @@ struct fb_var_screeninfo dnfb_var __devinitdata = { | |||
126 | .vmode = FB_VMODE_NONINTERLACED, | 126 | .vmode = FB_VMODE_NONINTERLACED, |
127 | }; | 127 | }; |
128 | 128 | ||
129 | static struct fb_fix_screeninfo dnfb_fix __devinitdata = { | 129 | static struct fb_fix_screeninfo dnfb_fix = { |
130 | .id = "Apollo Mono", | 130 | .id = "Apollo Mono", |
131 | .smem_start = (FRAME_BUFFER_START + IO_BASE), | 131 | .smem_start = (FRAME_BUFFER_START + IO_BASE), |
132 | .smem_len = FRAME_BUFFER_LEN, | 132 | .smem_len = FRAME_BUFFER_LEN, |
@@ -224,7 +224,7 @@ void dnfb_copyarea(struct fb_info *info, const struct fb_copyarea *area) | |||
224 | * Initialization | 224 | * Initialization |
225 | */ | 225 | */ |
226 | 226 | ||
227 | static int __devinit dnfb_probe(struct platform_device *dev) | 227 | static int dnfb_probe(struct platform_device *dev) |
228 | { | 228 | { |
229 | struct fb_info *info; | 229 | struct fb_info *info; |
230 | int err = 0; | 230 | int err = 0; |