projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ROSE]: Remove useless prototype for rose_remove_neigh().
[powerpc.git]
/
drivers
/
video
/
fbcvt.c
diff --git
a/drivers/video/fbcvt.c
b/drivers/video/fbcvt.c
index
cfa61b5
..
ac90883
100644
(file)
--- a/
drivers/video/fbcvt.c
+++ b/
drivers/video/fbcvt.c
@@
-214,12
+214,11
@@
static void fb_cvt_print_name(struct fb_cvt_data *cvt)
{
u32 pixcount, pixcount_mod;
int cnt = 255, offset = 0, read = 0;
{
u32 pixcount, pixcount_mod;
int cnt = 255, offset = 0, read = 0;
- u8 *buf = k
m
alloc(256, GFP_KERNEL);
+ u8 *buf = k
z
alloc(256, GFP_KERNEL);
if (!buf)
return;
if (!buf)
return;
- memset(buf, 0, 256);
pixcount = (cvt->xres * (cvt->yres/cvt->interlace))/1000000;
pixcount_mod = (cvt->xres * (cvt->yres/cvt->interlace)) % 1000000;
pixcount_mod /= 1000;
pixcount = (cvt->xres * (cvt->yres/cvt->interlace))/1000000;
pixcount_mod = (cvt->xres * (cvt->yres/cvt->interlace)) % 1000000;
pixcount_mod /= 1000;
@@
-272,11
+271,11
@@
static void fb_cvt_convert_to_mode(struct fb_cvt_data *cvt,
{
mode->refresh = cvt->f_refresh;
mode->pixclock = KHZ2PICOS(cvt->pixclock/1000);
{
mode->refresh = cvt->f_refresh;
mode->pixclock = KHZ2PICOS(cvt->pixclock/1000);
- mode->left_margin = cvt->h_
front
_porch;
- mode->right_margin = cvt->h_
back
_porch;
+ mode->left_margin = cvt->h_
back
_porch;
+ mode->right_margin = cvt->h_
front
_porch;
mode->hsync_len = cvt->hsync;
mode->hsync_len = cvt->hsync;
- mode->upper_margin = cvt->v_
front
_porch;
- mode->lower_margin = cvt->v_
back
_porch;
+ mode->upper_margin = cvt->v_
back
_porch;
+ mode->lower_margin = cvt->v_
front
_porch;
mode->vsync_len = cvt->vsync;
mode->sync &= ~(FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT);
mode->vsync_len = cvt->vsync;
mode->sync &= ~(FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT);