diff options
| author | James Morris <jmorris@namei.org> | 2009-09-29 17:47:33 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-09-29 17:47:33 -0400 |
| commit | 1669b049db50fc7f1d4e694fb115a0f408c63fce (patch) | |
| tree | 9b3b90b5cbff9b8f30ecf0b2a44896ce8bef0c20 /drivers/hid/hid-kensington.c | |
| parent | 7f366784f5c2b8fc0658b5b374f4c63ee42c789f (diff) | |
| parent | 17d857be649a21ca90008c6dc425d849fa83db5c (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'drivers/hid/hid-kensington.c')
| -rw-r--r-- | drivers/hid/hid-kensington.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hid/hid-kensington.c b/drivers/hid/hid-kensington.c index 7353bd79cbe9..a5b4016e9bd7 100644 --- a/drivers/hid/hid-kensington.c +++ b/drivers/hid/hid-kensington.c | |||
| @@ -48,12 +48,12 @@ static struct hid_driver ks_driver = { | |||
| 48 | .input_mapping = ks_input_mapping, | 48 | .input_mapping = ks_input_mapping, |
| 49 | }; | 49 | }; |
| 50 | 50 | ||
| 51 | static int ks_init(void) | 51 | static int __init ks_init(void) |
| 52 | { | 52 | { |
| 53 | return hid_register_driver(&ks_driver); | 53 | return hid_register_driver(&ks_driver); |
| 54 | } | 54 | } |
| 55 | 55 | ||
| 56 | static void ks_exit(void) | 56 | static void __exit ks_exit(void) |
| 57 | { | 57 | { |
| 58 | hid_unregister_driver(&ks_driver); | 58 | hid_unregister_driver(&ks_driver); |
| 59 | } | 59 | } |