Merge branch 'upstream' into for-linus

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

diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c
index 51d7d77..1e051f1 100644 (file)
--- a/drivers/hid/hid-wacom.c
+++ b/drivers/hid/hid-wacom.c
@@ -21,6 +21,7 @@
 #include <linux/device.h>
 #include <linux/hid.h>
 #include <linux/module.h>
+#include <linux/slab.h>
 #ifdef CONFIG_HID_WACOM_POWER_SUPPLY
 #include <linux/power_supply.h>
 #endif
@@ -455,7 +456,6 @@ static int __init wacom_init(void)
        ret = hid_register_driver(&wacom_driver);
        if (ret)
                printk(KERN_ERR "can't register wacom driver\n");
-       printk(KERN_ERR "wacom driver registered\n");
        return ret;
 }