aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-07 10:30:33 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-07 10:30:33 -0800
commit407cf84f956ee4b52da5508d5357b8ae212ff77c (patch)
treeb3efbcb770e1202b65aee2fe70ea5a407a60e6a5 /include
parentb3ce1debe2685383a9ad6ace9c49869c3968c013 (diff)
parent0aeafa77558fc1b44b0f39a4d9e5bd9316420788 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
Diffstat (limited to 'include')
-rw-r--r--include/linux/input.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/input.h b/include/linux/input.h
index f623c745c21..3c5823368dd 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)
class_device_put(&dev->cdev);
}
-void input_register_device(struct input_dev *);
+int input_register_device(struct input_dev *);
void input_unregister_device(struct input_dev *);
void input_register_handler(struct input_handler *);