diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/s390/char/keyboard.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/s390/char/keyboard.h')
| -rw-r--r-- | drivers/s390/char/keyboard.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/char/keyboard.h b/drivers/s390/char/keyboard.h index 5ccfe9cf126d..7e736aaeae6e 100644 --- a/drivers/s390/char/keyboard.h +++ b/drivers/s390/char/keyboard.h | |||
| @@ -36,7 +36,7 @@ void kbd_free(struct kbd_data *); | |||
| 36 | void kbd_ascebc(struct kbd_data *, unsigned char *); | 36 | void kbd_ascebc(struct kbd_data *, unsigned char *); |
| 37 | 37 | ||
| 38 | void kbd_keycode(struct kbd_data *, unsigned int); | 38 | void kbd_keycode(struct kbd_data *, unsigned int); |
| 39 | int kbd_ioctl(struct kbd_data *, struct file *, unsigned int, unsigned long); | 39 | int kbd_ioctl(struct kbd_data *, unsigned int, unsigned long); |
| 40 | 40 | ||
| 41 | /* | 41 | /* |
| 42 | * Helper Functions. | 42 | * Helper Functions. |