The following commit has been merged in the linux branch: commit fa59530267e1006b7180e9ce1dee4136907b2b65 Author: Peter Huewe peterhuewe@gmx.de Date: Tue Sep 29 03:24:55 2009 +0200

HID: add __init/__exit macros to twinhan.c

Trivial patch which adds the __init/__exit macros to the module_init/ module_exit functions of the twinhan driver in hid.

Signed-off-by: Peter Huewe peterhuewe@gmx.de Signed-off-by: Jiri Kosina jkosina@suse.cz

diff --git a/drivers/hid/hid-twinhan.c b/drivers/hid/hid-twinhan.c index b05f602..c40afc5 100644 --- a/drivers/hid/hid-twinhan.c +++ b/drivers/hid/hid-twinhan.c @@ -132,12 +132,12 @@ static struct hid_driver twinhan_driver = { .input_mapping = twinhan_input_mapping, };

-static int twinhan_init(void) +static int __init twinhan_init(void) { return hid_register_driver(&twinhan_driver); }

-static void twinhan_exit(void) +static void __exit twinhan_exit(void) { hid_unregister_driver(&twinhan_driver); }