diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-03 22:38:22 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-03 22:38:22 -0500 |
| commit | 9c119ba54c0fcae72881948af3d37b47a2f8e1f9 (patch) | |
| tree | 0be51b0bf02ece3bb32955e9d33a3998ecd57250 /drivers/net/usb | |
| parent | a4b97f2054af2e411c414ed4cb5e1d0dbfd24a47 (diff) | |
| parent | fdd3d631cddad20ad9d3e1eb7dbf26825a8a121f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/usb')
| -rw-r--r-- | drivers/net/usb/cdc_ether.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c index 21e183a83b99..4f27f022fbf7 100644 --- a/drivers/net/usb/cdc_ether.c +++ b/drivers/net/usb/cdc_ether.c | |||
| @@ -419,7 +419,7 @@ static int cdc_manage_power(struct usbnet *dev, int on) | |||
| 419 | 419 | ||
| 420 | static const struct driver_info cdc_info = { | 420 | static const struct driver_info cdc_info = { |
| 421 | .description = "CDC Ethernet Device", | 421 | .description = "CDC Ethernet Device", |
| 422 | .flags = FLAG_ETHER | FLAG_LINK_INTR, | 422 | .flags = FLAG_ETHER, |
| 423 | // .check_connect = cdc_check_connect, | 423 | // .check_connect = cdc_check_connect, |
| 424 | .bind = cdc_bind, | 424 | .bind = cdc_bind, |
| 425 | .unbind = usbnet_cdc_unbind, | 425 | .unbind = usbnet_cdc_unbind, |