Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[linux-2.6] / drivers / s390 / char / defkeymap.c

diff --git a/drivers/s390/char/defkeymap.c b/drivers/s390/char/defkeymap.c
index 564baca01b7c001635f9b6e4495f07468358c6e9..07c7f31081bccbe629c7bcbd789bb7665e57edb3 100644 (file)
--- a/drivers/s390/char/defkeymap.c
+++ b/drivers/s390/char/defkeymap.c
@@ -150,9 +150,9 @@ char *func_table[MAX_NR_FUNC] = {
        NULL,
 };
 
-struct kbdiacr accent_table[MAX_DIACR] = {
-       {'^', 'c', '\003'},     {'^', 'd', '\004'},
-       {'^', 'z', '\032'},     {'^', '\012', '\000'},
+struct kbdiacruc accent_table[MAX_DIACR] = {
+       {'^', 'c', 0003},       {'^', 'd', 0004},
+       {'^', 'z', 0032},       {'^', 0012, 0000},
 };
 
 unsigned int accent_table_size = 4;