Merge branch 'topstar-laptop' into release

[mv-sheeva.git] / drivers / s390 / char / defkeymap.c

diff --git a/drivers/s390/char/defkeymap.c b/drivers/s390/char/defkeymap.c
index 9692d6a205ef305972c226cdd99fa2507d0e035c..07c7f31081bccbe629c7bcbd789bb7665e57edb3 100644 (file)
--- a/drivers/s390/char/defkeymap.c
+++ b/drivers/s390/char/defkeymap.c
@@ -152,7 +152,7 @@ char *func_table[MAX_NR_FUNC] = {
 
 struct kbdiacruc accent_table[MAX_DIACR] = {
        {'^', 'c', 0003},       {'^', 'd', 0004},
-       {'^', 'z', 0032},       {'^', 0012', 0000},
+       {'^', 'z', 0032},       {'^', 0012, 0000},
 };
 
 unsigned int accent_table_size = 4;