diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 12:57:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 12:57:44 -0800 |
| commit | 6e5565f949af1322f8f3d3f43d044645ae448499 (patch) | |
| tree | 92868f6d3dcc6c105a0d35f9412f75c07139402e /Documentation | |
| parent | e5a9e8e6890d9b9c7a0f25b03ffdaf28614a9a4c (diff) | |
| parent | 03366e7b9bf1544cb0b98f1a5cd6d340654f486a (diff) | |
| download | linux-6e5565f949af1322f8f3d3f43d044645ae448499.tar.gz linux-6e5565f949af1322f8f3d3f43d044645ae448499.tar.bz2 linux-6e5565f949af1322f8f3d3f43d044645ae448499.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (34 commits)
Input: i8042 - non-x86 build fix
Input: pxa27x_keypad - also enable on PXA3xx
Input: pxa27x_keypad - add debounce_interval to the keypad platform data
Input: pxa27x_keypad - use device resources for I/O memory mapping and IRQ
Input: pxa27x_keypad - enable rotary encoders and direct keys
Input: pxa27x_keypad - introduce pxa27x_keypad_config()
Input: pxa27x_keypad - introduce driver structure and use KEY() to define matrix keys
Input: pxa27x_keypad - remove pin configuration from the driver
Input: pxa27x_keypad - rename the driver (was pxa27x_keyboard)
Input: constify function pointer tables (seq_operations)
Input: i8042 - add Fujitsu-Siemens Amilo Pro 2010 to nomux list
Input: i8042 - enable DMI quirks on x86-64
Input: i8042 - add Dritek quirk for Acer Aspire 9110
Input: add input event to APM event bridge
Input: mousedev - use BIT_MASK instead of BIT
Input: remove duplicate includes
Input: remove cdev from input_dev structure
Input: remove duplicated headers in drivers/char/keyboard.c
Input: i8042 - add Dritek keyboard extension quirk
Input: add Tosa keyboard driver
...
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/input/input-programming.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/input/input-programming.txt b/Documentation/input/input-programming.txt index 47fc86830cd7..81905e81585e 100644 --- a/Documentation/input/input-programming.txt +++ b/Documentation/input/input-programming.txt @@ -22,7 +22,7 @@ static struct input_dev *button_dev; static void button_interrupt(int irq, void *dummy, struct pt_regs *fp) { - input_report_key(button_dev, BTN_1, inb(BUTTON_PORT) & 1); + input_report_key(button_dev, BTN_0, inb(BUTTON_PORT) & 1); input_sync(button_dev); } |