diff options
| author | Len Brown <len.brown@intel.com> | 2009-09-19 08:06:59 +0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-09-19 08:06:59 +0400 |
| commit | 71fd68e7d234f6b7d8407c8f486764d24f8411f4 (patch) | |
| tree | 6dc2a4c356b4f454fc85d0c7cb019986f6f4993b /drivers/hid/hid-zpff.c | |
| parent | 8ff0e082f0833d32c7523a6cd72b6cf6a2142ce8 (diff) | |
| parent | 78f28b7c555359c67c2a0d23f7436e915329421e (diff) | |
| download | linux-71fd68e7d234f6b7d8407c8f486764d24f8411f4.tar.xz | |
Merge branch 'linus' into release
Diffstat (limited to 'drivers/hid/hid-zpff.c')
| -rw-r--r-- | drivers/hid/hid-zpff.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hid/hid-zpff.c b/drivers/hid/hid-zpff.c index 57f710757bf4..a79f0d78c6be 100644 --- a/drivers/hid/hid-zpff.c +++ b/drivers/hid/hid-zpff.c @@ -152,12 +152,12 @@ static struct hid_driver zp_driver = { .probe = zp_probe, }; -static int zp_init(void) +static int __init zp_init(void) { return hid_register_driver(&zp_driver); } -static void zp_exit(void) +static void __exit zp_exit(void) { hid_unregister_driver(&zp_driver); } |