diff --git a/[refs] b/[refs] index 1ff31e915f18..169eebb81e3e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d1fe0c98f2aef99fb57aaf6dd25e793c186cea3 +refs/heads/master: 761e95493982f3365e6ef34991a6c7ff84e33d25 diff --git a/trunk/drivers/staging/vt6655/device_main.c b/trunk/drivers/staging/vt6655/device_main.c index f43ca416e4a8..0a11d7fd8aa2 100644 --- a/trunk/drivers/staging/vt6655/device_main.c +++ b/trunk/drivers/staging/vt6655/device_main.c @@ -1146,14 +1146,9 @@ device_found1(struct pci_dev *pcid, const struct pci_device_id *ent) dev->irq = pcid->irq; dev->netdev_ops = &device_netdev_ops; -#ifdef WIRELESS_EXT -//Einsn Modify for ubuntu-7.04 -// dev->wireless_handlers->get_wireless_stats = iwctl_get_wireless_stats; -#if WIRELESS_EXT > 12 +#ifdef CONFIG_WIRELESS_EXT dev->wireless_handlers = (struct iw_handler_def *)&iwctl_handler_def; -// netdev->wireless_handlers = NULL; -#endif /* WIRELESS_EXT > 12 */ -#endif /* WIRELESS_EXT */ +#endif rc = register_netdev(dev); if (rc)