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

[net-next-2.6.git] / drivers / input / tablet / wacom_sys.c

diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c
index 2dc0c07c04699de92a3a101b1a6f78cf45d7cc48..42ba3691d908bc1fc8c370da5ada4287ceb21115 100644 (file)
--- a/drivers/input/tablet/wacom_sys.c
+++ b/drivers/input/tablet/wacom_sys.c
@@ -507,7 +507,6 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
                        goto fail3;
        }
 
-       input_dev->name = wacom_wac->name;
        input_dev->name = wacom_wac->name;
        input_dev->dev.parent = &intf->dev;
        input_dev->open = wacom_open;