git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'delayed-logging-for-2.6.35' into for-linus
[pandora-kernel.git]
/
drivers
/
char
/
consolemap.c
diff --git
a/drivers/char/consolemap.c
b/drivers/char/consolemap.c
index
4246b8e
..
45d3e80
100644
(file)
--- a/
drivers/char/consolemap.c
+++ b/
drivers/char/consolemap.c
@@
-554,7
+554,7
@@
int con_set_unimap(struct vc_data *vc, ushort ct, struct unipair __user *list)
__get_user(fontpos, &list->fontpos);
if ((err1 = con_insert_unipair(p, unicode,fontpos)) != 0)
err = err1;
-
list++;
+ list++;
}
if (con_unify_unimap(vc, p))