diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 19:35:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 19:35:11 -0400 |
| commit | 708e16892e1646594a29eaa7ac7b209b600b9fd2 (patch) | |
| tree | fe7c31bc0edef84eb1075c7e195340047d6aaa17 /Documentation/input/amijoy.txt | |
| parent | f3c87a8999c28f2948ebd407574f7e9fb5c577b2 (diff) | |
| parent | a847825970e741e20a09c659978baa34016b63bc (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (39 commits)
Add missing maintainer countries in CREDITS
Fix bytes <-> kilobytes typo in Kconfig for ramdisk
fix a typo in Documentation/pi-futex.txt
BUG_ON conversion for fs/xfs/
BUG_ON() conversion in fs/nfsd/
BUG_ON conversion for fs/reiserfs
BUG_ON cleanups in arch/i386
BUG_ON cleanup in drivers/net/tokenring/
BUG_ON cleanup for drivers/md/
kerneldoc-typo in led-class.c
debugfs: spelling fix
rcutorture: Fix incorrect description of default for nreaders parameter
parport: Remove space in function calls
Michal Wronski: update contact info
Spelling fix: "control" instead of "cotrol"
reboot parameter in Documentation/kernel-parameters.txt
Fix copy&waste bug in comment in scripts/kernel-doc
remove duplicate "until" from kernel/workqueue.c
ite_gpio fix tabbage
fix file specification in comments
...
Fixed trivial path conflicts due to removed files:
arch/mips/dec/boot/decstation.c, drivers/char/ite_gpio.c
Diffstat (limited to 'Documentation/input/amijoy.txt')
| -rw-r--r-- | Documentation/input/amijoy.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/input/amijoy.txt b/Documentation/input/amijoy.txt index 3b8b2d43a68e..4f0e89df5c51 100644 --- a/Documentation/input/amijoy.txt +++ b/Documentation/input/amijoy.txt | |||
| @@ -79,10 +79,10 @@ JOY0DAT Y7 Y6 Y5 Y4 Y3 Y2 Y1 Y0 X7 X6 X5 X4 X3 X2 X1 X0 | |||
| 79 | JOY1DAT Y7 Y6 Y5 Y4 Y3 Y2 Y1 Y0 X7 X6 X5 X4 X3 X2 X1 X0 | 79 | JOY1DAT Y7 Y6 Y5 Y4 Y3 Y2 Y1 Y0 X7 X6 X5 X4 X3 X2 X1 X0 |
| 80 | 80 | ||
| 81 | 0=LEFT CONTROLLER PAIR, 1=RIGHT CONTROLLER PAIR. | 81 | 0=LEFT CONTROLLER PAIR, 1=RIGHT CONTROLLER PAIR. |
| 82 | (4 counters total).The bit usage for both left and right | 82 | (4 counters total). The bit usage for both left and right |
| 83 | addresses is shown below. Each 6 bit counter (Y7-Y2,X7-X2) is | 83 | addresses is shown below. Each 6 bit counter (Y7-Y2,X7-X2) is |
| 84 | clocked by 2 of the signals input from the mouse serial | 84 | clocked by 2 of the signals input from the mouse serial |
| 85 | stream. Starting with first bit recived: | 85 | stream. Starting with first bit received: |
| 86 | 86 | ||
| 87 | +-------------------+-----------------------------------------+ | 87 | +-------------------+-----------------------------------------+ |
| 88 | | Serial | Bit Name | Description | | 88 | | Serial | Bit Name | Description | |