Merge branch 'linus' into cont_syslog

[safe/jmp/linux-2.6] / drivers / hid / hid-pl.c

diff --git a/drivers/hid/hid-pl.c b/drivers/hid/hid-pl.c
index 9ad76bf..9f41e2b 100644 (file)
--- a/drivers/hid/hid-pl.c
+++ b/drivers/hid/hid-pl.c
@@ -39,6 +39,7 @@
 #define debug(format, arg...) pr_debug("hid-plff: " format "\n" , ## arg)
 
 #include <linux/input.h>
+#include <linux/slab.h>
 #include <linux/usb.h>
 #include <linux/hid.h>
 
@@ -217,12 +218,12 @@ static struct hid_driver pl_driver = {
        .probe = pl_probe,
 };
 
-static int pl_init(void)
+static int __init pl_init(void)
 {
        return hid_register_driver(&pl_driver);
 }
 
-static void pl_exit(void)
+static void __exit pl_exit(void)
 {
        hid_unregister_driver(&pl_driver);
 }
@@ -230,5 +231,3 @@ static void pl_exit(void)
 module_init(pl_init);
 module_exit(pl_exit);
 MODULE_LICENSE("GPL");
-
-HID_COMPAT_LOAD_DRIVER(pantherlord);