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 /arch/m68k/atari/atakeyb.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 'arch/m68k/atari/atakeyb.c')
| -rw-r--r-- | arch/m68k/atari/atakeyb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/atari/atakeyb.c b/arch/m68k/atari/atakeyb.c index 5890897d28b..b995513d527 100644 --- a/arch/m68k/atari/atakeyb.c +++ b/arch/m68k/atari/atakeyb.c | |||
| @@ -130,7 +130,7 @@ KEYBOARD_STATE kb_state; | |||
| 130 | * it's really hard to decide whether they're mouse or keyboard bytes. Since | 130 | * it's really hard to decide whether they're mouse or keyboard bytes. Since |
| 131 | * overruns usually occur when moving the Atari mouse rapidly, they're seen as | 131 | * overruns usually occur when moving the Atari mouse rapidly, they're seen as |
| 132 | * mouse bytes here. If this is wrong, only a make code of the keyboard gets | 132 | * mouse bytes here. If this is wrong, only a make code of the keyboard gets |
| 133 | * lost, which isn't too bad. Loosing a break code would be disastrous, | 133 | * lost, which isn't too bad. Losing a break code would be disastrous, |
| 134 | * because then the keyboard repeat strikes... | 134 | * because then the keyboard repeat strikes... |
| 135 | */ | 135 | */ |
| 136 | 136 | ||