aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-wacom.c
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2009-09-29 17:47:33 -0400
committerJames Morris <jmorris@namei.org>2009-09-29 17:47:33 -0400
commit1669b049db50fc7f1d4e694fb115a0f408c63fce (patch)
tree9b3b90b5cbff9b8f30ecf0b2a44896ce8bef0c20 /drivers/hid/hid-wacom.c
parent7f366784f5c2b8fc0658b5b374f4c63ee42c789f (diff)
parent17d857be649a21ca90008c6dc425d849fa83db5c (diff)
Merge branch 'master' into next
Diffstat (limited to 'drivers/hid/hid-wacom.c')
-rw-r--r--drivers/hid/hid-wacom.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c
index 1f9237f511e3..747542172242 100644
--- a/drivers/hid/hid-wacom.c
+++ b/drivers/hid/hid-wacom.c
@@ -237,7 +237,7 @@ static struct hid_driver wacom_driver = {
237 .raw_event = wacom_raw_event, 237 .raw_event = wacom_raw_event,
238}; 238};
239 239
240static int wacom_init(void) 240static int __init wacom_init(void)
241{ 241{
242 int ret; 242 int ret;
243 243
@@ -248,7 +248,7 @@ static int wacom_init(void)
248 return ret; 248 return ret;
249} 249}
250 250
251static void wacom_exit(void) 251static void __exit wacom_exit(void)
252{ 252{
253 hid_unregister_driver(&wacom_driver); 253 hid_unregister_driver(&wacom_driver);
254} 254}