aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-28 09:59:26 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-28 09:59:26 -0700
commitf934fb19ef34730263e6afc01e8ec27a8a71470f (patch)
tree6988fa3734adb98ab989657c56b7e31e94e723f8 /include
parent3988ba0708e98b4bafc9034aa476775520bee708 (diff)
parent72d18a7b9e1a3a9511bae78fc7f0932ae01d5d73 (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: Input: add driver for Atmel integrated touchscreen controller Input: ads7846 - optimize order of calculating Rt in ads7846_rx() Input: ads7846 - fix sparse endian warnings Input: uinput - remove duplicate include Input: serio - offload resume to kseriod Input: serio - mark serio_register_driver() __must_check
Diffstat (limited to 'include')
-rw-r--r--include/linux/serio.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/serio.h b/include/linux/serio.h
index e72716cca57..25641d9e0ea 100644
--- a/include/linux/serio.h
+++ b/include/linux/serio.h
@@ -87,11 +87,10 @@ void serio_unregister_port(struct serio *serio);
void serio_unregister_child_port(struct serio *serio);
int __serio_register_driver(struct serio_driver *drv, struct module *owner, const char *mod_name);
-static inline int serio_register_driver(struct serio_driver *drv)
+static inline int __must_check serio_register_driver(struct serio_driver *drv)
{
return __serio_register_driver(drv, THIS_MODULE, KBUILD_MODNAME);
}
-int serio_register_driver(struct serio_driver *drv);
void serio_unregister_driver(struct serio_driver *drv);
static inline int serio_write(struct serio *serio, unsigned char data)