Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6

[karo-tx-linux.git] / include / linux / input-polldev.h

diff --git a/include/linux/input-polldev.h b/include/linux/input-polldev.h
index 5e3dddf8f562651f488dd4b3061fbfefabb98f7a..ce0b72464eb814bf5902e3daf423522934963b8c 100644 (file)
--- a/include/linux/input-polldev.h
+++ b/include/linux/input-polldev.h
@@ -22,12 +22,12 @@
  * @poll: driver-supplied method that polls the device and posts
  *     input events (mandatory).
  * @poll_interval: specifies how often the poll() method should be called.
- *     Defaults to 500 msec unless overriden when registering the device.
+ *     Defaults to 500 msec unless overridden when registering the device.
  * @poll_interval_max: specifies upper bound for the poll interval.
  *     Defaults to the initial value of @poll_interval.
  * @poll_interval_min: specifies lower bound for the poll interval.
  *     Defaults to 0.
- * @input: input device structire associated with the polled device.
+ * @input: input device structure associated with the polled device.
  *     Must be properly initialized by the driver (id, name, phys, bits).
  *
  * Polled input device provides a skeleton for supporting simple input