diff options
| -rw-r--r-- | drivers/hid/hid-apple.c | 5 | ||||
| -rw-r--r-- | include/linux/input.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c index ce3c39938f9f..9b97795e45ad 100644 --- a/drivers/hid/hid-apple.c +++ b/drivers/hid/hid-apple.c | |||
| @@ -55,10 +55,11 @@ struct apple_key_translation { | |||
| 55 | 55 | ||
| 56 | static struct apple_key_translation apple_fn_keys[] = { | 56 | static struct apple_key_translation apple_fn_keys[] = { |
| 57 | { KEY_BACKSPACE, KEY_DELETE }, | 57 | { KEY_BACKSPACE, KEY_DELETE }, |
| 58 | { KEY_ENTER, KEY_INSERT }, | ||
| 58 | { KEY_F1, KEY_BRIGHTNESSDOWN, APPLE_FLAG_FKEY }, | 59 | { KEY_F1, KEY_BRIGHTNESSDOWN, APPLE_FLAG_FKEY }, |
| 59 | { KEY_F2, KEY_BRIGHTNESSUP, APPLE_FLAG_FKEY }, | 60 | { KEY_F2, KEY_BRIGHTNESSUP, APPLE_FLAG_FKEY }, |
| 60 | { KEY_F3, KEY_FN_F5, APPLE_FLAG_FKEY }, /* Exposé */ | 61 | { KEY_F3, KEY_SCALE, APPLE_FLAG_FKEY }, |
| 61 | { KEY_F4, KEY_FN_F4, APPLE_FLAG_FKEY }, /* Dashboard */ | 62 | { KEY_F4, KEY_DASHBOARD, APPLE_FLAG_FKEY }, |
| 62 | { KEY_F5, KEY_KBDILLUMDOWN, APPLE_FLAG_FKEY }, | 63 | { KEY_F5, KEY_KBDILLUMDOWN, APPLE_FLAG_FKEY }, |
| 63 | { KEY_F6, KEY_KBDILLUMUP, APPLE_FLAG_FKEY }, | 64 | { KEY_F6, KEY_KBDILLUMUP, APPLE_FLAG_FKEY }, |
| 64 | { KEY_F7, KEY_PREVIOUSSONG, APPLE_FLAG_FKEY }, | 65 | { KEY_F7, KEY_PREVIOUSSONG, APPLE_FLAG_FKEY }, |
diff --git a/include/linux/input.h b/include/linux/input.h index b86fb5581ce6..5341e8251f8c 100644 --- a/include/linux/input.h +++ b/include/linux/input.h | |||
| @@ -238,6 +238,7 @@ struct input_absinfo { | |||
| 238 | #define KEY_KPEQUAL 117 | 238 | #define KEY_KPEQUAL 117 |
| 239 | #define KEY_KPPLUSMINUS 118 | 239 | #define KEY_KPPLUSMINUS 118 |
| 240 | #define KEY_PAUSE 119 | 240 | #define KEY_PAUSE 119 |
| 241 | #define KEY_SCALE 120 /* AL Compiz Scale (Expose) */ | ||
| 241 | 242 | ||
| 242 | #define KEY_KPCOMMA 121 | 243 | #define KEY_KPCOMMA 121 |
| 243 | #define KEY_HANGEUL 122 | 244 | #define KEY_HANGEUL 122 |
| @@ -322,6 +323,7 @@ struct input_absinfo { | |||
| 322 | #define KEY_PAUSECD 201 | 323 | #define KEY_PAUSECD 201 |
| 323 | #define KEY_PROG3 202 | 324 | #define KEY_PROG3 202 |
| 324 | #define KEY_PROG4 203 | 325 | #define KEY_PROG4 203 |
| 326 | #define KEY_DASHBOARD 204 /* AL Dashboard */ | ||
| 325 | #define KEY_SUSPEND 205 | 327 | #define KEY_SUSPEND 205 |
| 326 | #define KEY_CLOSE 206 /* AC Close */ | 328 | #define KEY_CLOSE 206 /* AC Close */ |
| 327 | #define KEY_PLAY 207 | 329 | #define KEY_PLAY 207 |
