diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-07-06 22:55:05 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-07-06 22:55:05 -0400 |
| commit | 2b5c0c72ea404d6b554a8284031dd78748314b9e (patch) | |
| tree | 468b7f3d8db0abe6a09ee221dce1de5de2bb8d12 /drivers/video/sis/sis_main.c | |
| parent | 2dbc8a23cc2e677422f6dea991aca4e3d31ab65f (diff) | |
| parent | dc53fffc105f68cb08ca872acd51550e89aa2e67 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh/for-2.6.31
Diffstat (limited to 'drivers/video/sis/sis_main.c')
| -rw-r--r-- | drivers/video/sis/sis_main.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/sis/sis_main.c b/drivers/video/sis/sis_main.c index fd33455389b8..4a067f0d0ceb 100644 --- a/drivers/video/sis/sis_main.c +++ b/drivers/video/sis/sis_main.c | |||
| @@ -6367,7 +6367,6 @@ error_3: vfree(ivideo->bios_abase); | |||
| 6367 | sis_fb_info->fix = ivideo->sisfb_fix; | 6367 | sis_fb_info->fix = ivideo->sisfb_fix; |
| 6368 | sis_fb_info->screen_base = ivideo->video_vbase + ivideo->video_offset; | 6368 | sis_fb_info->screen_base = ivideo->video_vbase + ivideo->video_offset; |
| 6369 | sis_fb_info->fbops = &sisfb_ops; | 6369 | sis_fb_info->fbops = &sisfb_ops; |
| 6370 | sisfb_get_fix(&sis_fb_info->fix, -1, sis_fb_info); | ||
| 6371 | sis_fb_info->pseudo_palette = ivideo->pseudo_palette; | 6370 | sis_fb_info->pseudo_palette = ivideo->pseudo_palette; |
| 6372 | 6371 | ||
| 6373 | fb_alloc_cmap(&sis_fb_info->cmap, 256 , 0); | 6372 | fb_alloc_cmap(&sis_fb_info->cmap, 256 , 0); |