diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
| commit | 57cad8084e0837e0f2c97da789ec9b3f36809be9 (patch) | |
| tree | e9c790afb4286f78cb08d9664f58baa7e876fe55 /drivers/s390/char/defkeymap.c | |
| parent | cb18bd40030c879cd93fef02fd579f74dbab473d (diff) | |
| parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'drivers/s390/char/defkeymap.c')
| -rw-r--r-- | drivers/s390/char/defkeymap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/s390/char/defkeymap.c b/drivers/s390/char/defkeymap.c index ca15adb140d1..17027d918cf7 100644 --- a/drivers/s390/char/defkeymap.c +++ b/drivers/s390/char/defkeymap.c | |||
| @@ -83,8 +83,8 @@ static u_short shift_ctrl_map[NR_KEYS] = { | |||
| 83 | }; | 83 | }; |
| 84 | 84 | ||
| 85 | ushort *key_maps[MAX_NR_KEYMAPS] = { | 85 | ushort *key_maps[MAX_NR_KEYMAPS] = { |
| 86 | plain_map, shift_map, 0, 0, | 86 | plain_map, shift_map, NULL, NULL, |
| 87 | ctrl_map, shift_ctrl_map, 0 | 87 | ctrl_map, shift_ctrl_map, NULL, |
| 88 | }; | 88 | }; |
| 89 | 89 | ||
| 90 | unsigned int keymap_count = 4; | 90 | unsigned int keymap_count = 4; |
| @@ -145,7 +145,7 @@ char *func_table[MAX_NR_FUNC] = { | |||
| 145 | func_buf + 97, | 145 | func_buf + 97, |
| 146 | func_buf + 103, | 146 | func_buf + 103, |
| 147 | func_buf + 109, | 147 | func_buf + 109, |
| 148 | 0, | 148 | NULL, |
| 149 | }; | 149 | }; |
| 150 | 150 | ||
| 151 | struct kbdiacr accent_table[MAX_DIACR] = { | 151 | struct kbdiacr accent_table[MAX_DIACR] = { |