Merge commit 'gcl/merge' into merge

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

diff --git a/drivers/hid/hid-microsoft.c b/drivers/hid/hid-microsoft.c
index 5e9e37a0506dd96adc8164855fdfac69c7e6fd1e..359cc447c6c600d61387e5b8cc6679dc1d4d6b75 100644 (file)
--- a/drivers/hid/hid-microsoft.c
+++ b/drivers/hid/hid-microsoft.c
@@ -197,12 +197,12 @@ static struct hid_driver ms_driver = {
        .probe = ms_probe,
 };
 
-static int ms_init(void)
+static int __init ms_init(void)
 {
        return hid_register_driver(&ms_driver);
 }
 
-static void ms_exit(void)
+static void __exit ms_exit(void)
 {
        hid_unregister_driver(&ms_driver);
 }