diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
| commit | 330f28f691e9b349e34adcaf82b273cf061bb491 (patch) | |
| tree | fca3bfe41eff25ef19f576cef1979c68f6521af5 /drivers/hid/hid-twinhan.c | |
| parent | fe3e78e073d25308756f38019956061153267769 (diff) | |
| parent | 6fc786d5034ed7ce2d43c459211137de6d99dd28 (diff) | |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'drivers/hid/hid-twinhan.c')
| -rw-r--r-- | drivers/hid/hid-twinhan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hid/hid-twinhan.c b/drivers/hid/hid-twinhan.c index b05f602c051e..c40afc57fc8f 100644 --- a/drivers/hid/hid-twinhan.c +++ b/drivers/hid/hid-twinhan.c | |||
| @@ -132,12 +132,12 @@ static struct hid_driver twinhan_driver = { | |||
| 132 | .input_mapping = twinhan_input_mapping, | 132 | .input_mapping = twinhan_input_mapping, |
| 133 | }; | 133 | }; |
| 134 | 134 | ||
| 135 | static int twinhan_init(void) | 135 | static int __init twinhan_init(void) |
| 136 | { | 136 | { |
| 137 | return hid_register_driver(&twinhan_driver); | 137 | return hid_register_driver(&twinhan_driver); |
| 138 | } | 138 | } |
| 139 | 139 | ||
| 140 | static void twinhan_exit(void) | 140 | static void __exit twinhan_exit(void) |
| 141 | { | 141 | { |
| 142 | hid_unregister_driver(&twinhan_driver); | 142 | hid_unregister_driver(&twinhan_driver); |
| 143 | } | 143 | } |