diff --git a/[refs] b/[refs] index 39b21ce611aa..9ad6af4cb567 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3afc571e6b2b2d6b291309363e196d814b583e66 +refs/heads/master: 42caa16a70b875bb171874af329c7575fa10c091 diff --git a/trunk/drivers/staging/vt6656/device.h b/trunk/drivers/staging/vt6656/device.h index b4d8ed9b28a1..8b541d1d0e23 100644 --- a/trunk/drivers/staging/vt6656/device.h +++ b/trunk/drivers/staging/vt6656/device.h @@ -44,7 +44,6 @@ #include #include #include -#include #include #include #include diff --git a/trunk/drivers/staging/vt6656/main_usb.c b/trunk/drivers/staging/vt6656/main_usb.c index c14730083134..3c1efaa6e4b6 100644 --- a/trunk/drivers/staging/vt6656/main_usb.c +++ b/trunk/drivers/staging/vt6656/main_usb.c @@ -807,12 +807,6 @@ vntwusb_found1(struct usb_interface *intf, const struct usb_device_id *id) kfree(pDevice); return -ENODEV; } - //2008-0623-02by MikeLiu - //2007-0821-01by MikeLiu - //#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21) - //usb_set_intfdata(intf, pDevice); - //SET_NETDEV_DEV(netdev, &intf->dev); - //#endif //2008-07-21-01by MikeLiu //register wpadev