Merge branch 'for-linus' of git://repo.or.cz/cris-mirror

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

diff --git a/drivers/s390/char/defkeymap.c b/drivers/s390/char/defkeymap.c
index 17027d918cf78e435821b3fe56f5ebb4d002f9ab..07c7f31081bccbe629c7bcbd789bb7665e57edb3 100644 (file)
--- a/drivers/s390/char/defkeymap.c
+++ b/drivers/s390/char/defkeymap.c
@@ -5,6 +5,8 @@
 #include <linux/types.h>
 #include <linux/keyboard.h>
 #include <linux/kd.h>
+#include <linux/kbd_kern.h>
+#include <linux/kbd_diacr.h>
 
 u_short plain_map[NR_KEYS] = {
        0xf000, 0xf000, 0xf000, 0xf000, 0xf000, 0xf000, 0xf000, 0xf000,
@@ -148,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;