git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
video
/
softcursor.c
diff --git
a/drivers/video/softcursor.c
b/drivers/video/softcursor.c
index
a953b46
..
f385759
100644
(file)
--- a/
drivers/video/softcursor.c
+++ b/
drivers/video/softcursor.c
@@
-43,7
+43,7
@@
int soft_cursor(struct fb_info *info, struct fb_cursor *cursor)
info->cursor.image.fg_color = cursor->image.fg_color;
} else {
if (cursor->image.cmap.len)
info->cursor.image.fg_color = cursor->image.fg_color;
} else {
if (cursor->image.cmap.len)
- fb_copy_cmap(&cursor->image.cmap, &info->cursor.image.cmap);
+ fb_copy_cmap(&cursor->image.cmap, &info->cursor.image.cmap
, 0
);
}
info->cursor.image.depth = cursor->image.depth;
}
}
info->cursor.image.depth = cursor->image.depth;
}