diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-20 01:27:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-20 01:27:06 -0400 |
| commit | a952baa034ae7c2e4a66932005cbc7ebbccfe28d (patch) | |
| tree | ff5abe0c77f5b129946300677d9b57b00d926a1e /include/linux/input-polldev.h | |
| parent | 5bab188a316718a26346cdb25c4cc6b319f8f907 (diff) | |
| parent | 97eb3f24352ec6632c2127b35d8087d2a809a9b9 (diff) | |
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: (64 commits)
Input: tsc2005 - remove 'disable' sysfs attribute
Input: tsc2005 - add open/close
Input: tsc2005 - handle read errors from SPI layer
Input: tsc2005 - do not rearm timer in hardirq handler
Input: tsc2005 - don't use work for 'pen up' handling
Input: tsc2005 - do not use 0 in place of NULL
Input: tsc2005 - use true/false for boolean variables
Input: tsc2005 - hide selftest attribute if we can't reset
Input: tsc2005 - rework driver initialization code
Input: tsc2005 - set up bus type in input device
Input: tsc2005 - set up parent device
Input: tsc2005 - clear driver data after unbinding
Input: tsc2005 - add module description
Input: tsc2005 - remove driver banner message
Input: tsc2005 - remove incorrect module alias
Input: tsc2005 - convert to using dev_pm_ops
Input: tsc2005 - use spi_get/set_drvdata()
Input: introduce tsc2005 driver
Input: xen-kbdfront - move to drivers/input/misc
Input: xen-kbdfront - add grant reference for shared page
...
Diffstat (limited to 'include/linux/input-polldev.h')
| -rw-r--r-- | include/linux/input-polldev.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/input-polldev.h b/include/linux/input-polldev.h index 5e3dddf8f562..ce0b72464eb8 100644 --- a/include/linux/input-polldev.h +++ b/include/linux/input-polldev.h | |||
| @@ -22,12 +22,12 @@ | |||
| 22 | * @poll: driver-supplied method that polls the device and posts | 22 | * @poll: driver-supplied method that polls the device and posts |
| 23 | * input events (mandatory). | 23 | * input events (mandatory). |
| 24 | * @poll_interval: specifies how often the poll() method should be called. | 24 | * @poll_interval: specifies how often the poll() method should be called. |
| 25 | * Defaults to 500 msec unless overriden when registering the device. | 25 | * Defaults to 500 msec unless overridden when registering the device. |
| 26 | * @poll_interval_max: specifies upper bound for the poll interval. | 26 | * @poll_interval_max: specifies upper bound for the poll interval. |
| 27 | * Defaults to the initial value of @poll_interval. | 27 | * Defaults to the initial value of @poll_interval. |
| 28 | * @poll_interval_min: specifies lower bound for the poll interval. | 28 | * @poll_interval_min: specifies lower bound for the poll interval. |
| 29 | * Defaults to 0. | 29 | * Defaults to 0. |
| 30 | * @input: input device structire associated with the polled device. | 30 | * @input: input device structure associated with the polled device. |
| 31 | * Must be properly initialized by the driver (id, name, phys, bits). | 31 | * Must be properly initialized by the driver (id, name, phys, bits). |
| 32 | * | 32 | * |
| 33 | * Polled input device provides a skeleton for supporting simple input | 33 | * Polled input device provides a skeleton for supporting simple input |