Merge commit 'gcl/merge' into merge

[~andy/linux] / drivers / hid / hid-topseed.c

diff --git a/drivers/hid/hid-topseed.c b/drivers/hid/hid-topseed.c
index 152ccfabeba5cf59d523d59feeac2e0abde04f4a..6925eda1081a81755eb271dc38e2d1ca27deb991 100644 (file)
--- a/drivers/hid/hid-topseed.c
+++ b/drivers/hid/hid-topseed.c
@@ -60,12 +60,12 @@ static struct hid_driver ts_driver = {
        .input_mapping = ts_input_mapping,
 };
 
-static int ts_init(void)
+static int __init ts_init(void)
 {
        return hid_register_driver(&ts_driver);
 }
 
-static void ts_exit(void)
+static void __exit ts_exit(void)
 {
        hid_unregister_driver(&ts_driver);
 }