Merge branch 'x86-trampoline-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[mv-sheeva.git] / drivers / hid / hid-zpff.c

diff --git a/drivers/hid/hid-zpff.c b/drivers/hid/hid-zpff.c
index 57f710757bf425ac6b32fb49314121357e327b41..b7acceabba803fe8af9bba278872ed406ab6bff8 100644 (file)
--- a/drivers/hid/hid-zpff.c
+++ b/drivers/hid/hid-zpff.c
@@ -23,6 +23,7 @@
 
 #include <linux/hid.h>
 #include <linux/input.h>
+#include <linux/slab.h>
 #include <linux/usb.h>
 
 #include "hid-ids.h"
@@ -152,12 +153,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);
 }