Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

[mv-sheeva.git] / drivers / char / consolemap.c

diff --git a/drivers/char/consolemap.c b/drivers/char/consolemap.c
index 6b104e45a322b3a5bd321a07f12a4c3936441db6..45d3e80156d45e15d08a1fa164686031126adc4c 100644 (file)
--- a/drivers/char/consolemap.c
+++ b/drivers/char/consolemap.c
@@ -277,6 +277,7 @@ u16 inverse_translate(struct vc_data *conp, int glyph, int use_unicode)
                        return p->inverse_translations[m][glyph];
        }
 }
+EXPORT_SYMBOL_GPL(inverse_translate);
 
 static void update_user_maps(void)
 {
@@ -553,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))