diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:07:12 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:07:12 -0500 |
| commit | a892acacd3a8546ac161526522f13b5174f2c471 (patch) | |
| tree | ee6d36f27f1388989ebfcabf90253fb7194112ac /include/linux/input.h | |
| parent | 193515d51ccb363165d6b09e9ba5c21089e34bad (diff) | |
| parent | 330d57fb98a916fa8e1363846540dd420e99499a (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/linux/input.h')
| -rw-r--r-- | include/linux/input.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/input.h b/include/linux/input.h index f623c745c21c..3c5823368ddb 100644 --- a/include/linux/input.h +++ b/include/linux/input.h | |||
| @@ -1007,7 +1007,7 @@ static inline void input_put_device(struct input_dev *dev) | |||
| 1007 | class_device_put(&dev->cdev); | 1007 | class_device_put(&dev->cdev); |
| 1008 | } | 1008 | } |
| 1009 | 1009 | ||
| 1010 | void input_register_device(struct input_dev *); | 1010 | int input_register_device(struct input_dev *); |
| 1011 | void input_unregister_device(struct input_dev *); | 1011 | void input_unregister_device(struct input_dev *); |
| 1012 | 1012 | ||
| 1013 | void input_register_handler(struct input_handler *); | 1013 | void input_register_handler(struct input_handler *); |