diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-01-23 18:07:21 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-23 18:07:21 -0500 |
| commit | 9156ad48338e0306e508ead5c0d9986050744475 (patch) | |
| tree | 37f3a90e38190052ecf3cdf9171dfdddd37b56fd /drivers/macintosh | |
| parent | fa28237cfcc5827553044cbd6ee52e33692b0faa (diff) | |
| parent | 8f7b3d156d348b6766833cd4e272d0d19b501e64 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/macintosh')
| -rw-r--r-- | drivers/macintosh/adbhid.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/macintosh/adbhid.c b/drivers/macintosh/adbhid.c index 883da72b5368..ef4c117ea35f 100644 --- a/drivers/macintosh/adbhid.c +++ b/drivers/macintosh/adbhid.c | |||
| @@ -322,8 +322,9 @@ adbhid_input_keycode(int id, int scancode, int repeat) | |||
| 322 | input_sync(ahid->input); | 322 | input_sync(ahid->input); |
| 323 | input_report_key(ahid->input, KEY_CAPSLOCK, 0); | 323 | input_report_key(ahid->input, KEY_CAPSLOCK, 0); |
| 324 | input_sync(ahid->input); | 324 | input_sync(ahid->input); |
| 325 | return; | ||
| 325 | } | 326 | } |
| 326 | return; | 327 | break; |
| 327 | #ifdef CONFIG_PPC_PMAC | 328 | #ifdef CONFIG_PPC_PMAC |
| 328 | case ADB_KEY_POWER_OLD: /* Power key on PBook 3400 needs remapping */ | 329 | case ADB_KEY_POWER_OLD: /* Power key on PBook 3400 needs remapping */ |
| 329 | switch(pmac_call_feature(PMAC_FTR_GET_MB_INFO, | 330 | switch(pmac_call_feature(PMAC_FTR_GET_MB_INFO, |