diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/macintosh/adbhid.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/macintosh/adbhid.c')
| -rw-r--r-- | drivers/macintosh/adbhid.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/macintosh/adbhid.c b/drivers/macintosh/adbhid.c index 5396c67ba0a4..09d72bb00d12 100644 --- a/drivers/macintosh/adbhid.c +++ b/drivers/macintosh/adbhid.c | |||
| @@ -328,7 +328,7 @@ adbhid_input_keycode(int id, int scancode, int repeat) | |||
| 328 | switch (keycode) { | 328 | switch (keycode) { |
| 329 | case ADB_KEY_CAPSLOCK: | 329 | case ADB_KEY_CAPSLOCK: |
| 330 | if (!restore_capslock_events) { | 330 | if (!restore_capslock_events) { |
| 331 | /* Generate down/up events for CapsLock everytime. */ | 331 | /* Generate down/up events for CapsLock every time. */ |
| 332 | input_report_key(ahid->input, KEY_CAPSLOCK, 1); | 332 | input_report_key(ahid->input, KEY_CAPSLOCK, 1); |
| 333 | input_sync(ahid->input); | 333 | input_sync(ahid->input); |
| 334 | input_report_key(ahid->input, KEY_CAPSLOCK, 0); | 334 | input_report_key(ahid->input, KEY_CAPSLOCK, 0); |