summaryrefslogtreecommitdiff
path: root/drivers/staging/vt6656/main_usb.c
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2009-12-10 17:12:17 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2009-12-10 17:12:17 +1100
commit530220682edacd1ddcfbdf29f51c856335f50703 (patch)
tree379200a700ae05235e0ed6995254430fb8db76f9 /drivers/staging/vt6656/main_usb.c
parentcc4c54e4beddf383845c6074d303eea89859a4ba (diff)
parente0b0f9ac76a0d60439718dffac92ec5d3d1f000b (diff)
Merge branch 'quilt/staging'
Conflicts: drivers/staging/Kconfig drivers/staging/Makefile drivers/staging/comedi/drivers/ni_labpc_cs.c drivers/staging/comedi/drivers/ni_mio_cs.c drivers/staging/vt6655/Kconfig drivers/staging/vt6656/Kconfig
Diffstat (limited to 'drivers/staging/vt6656/main_usb.c')
-rw-r--r--drivers/staging/vt6656/main_usb.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c
index 05186110c029..ef17c4958c67 100644
--- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -64,11 +64,9 @@
#include "ioctl.h"
#include "iwctl.h"
#include "dpc.h"
-#include "iocmd.h"
#include "datarate.h"
#include "rf.h"
#include "firmware.h"
-#include "mac.h"
#include "rndis.h"
#include "control.h"
#include "channel.h"
@@ -809,12 +807,6 @@ vntwusb_found1(struct usb_interface *intf, const struct usb_device_id *id)
kfree(pDevice);
return -ENODEV;
}
- //2008-0623-02<Remark>by MikeLiu
- //2007-0821-01<Add>by 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-01<Add>by MikeLiu
//register wpadev
@@ -1545,7 +1537,7 @@ if(result!=0) {
return buffer;
}
-//return --->-1:fail; >=0:sucessful
+//return --->-1:fail; >=0:successful
static int Read_config_file(PSDevice pDevice) {
int result=0;
UCHAR tmpbuffer[100];