diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /drivers/net/usb/dm9601.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'drivers/net/usb/dm9601.c')
| -rw-r--r-- | drivers/net/usb/dm9601.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c index a2b30a10064f..3d406f9b2f29 100644 --- a/drivers/net/usb/dm9601.c +++ b/drivers/net/usb/dm9601.c | |||
| @@ -611,7 +611,7 @@ static int dm9601_link_reset(struct usbnet *dev) | |||
| 611 | 611 | ||
| 612 | static const struct driver_info dm9601_info = { | 612 | static const struct driver_info dm9601_info = { |
| 613 | .description = "Davicom DM9601 USB Ethernet", | 613 | .description = "Davicom DM9601 USB Ethernet", |
| 614 | .flags = FLAG_ETHER, | 614 | .flags = FLAG_ETHER | FLAG_LINK_INTR, |
| 615 | .bind = dm9601_bind, | 615 | .bind = dm9601_bind, |
| 616 | .rx_fixup = dm9601_rx_fixup, | 616 | .rx_fixup = dm9601_rx_fixup, |
| 617 | .tx_fixup = dm9601_tx_fixup, | 617 | .tx_fixup = dm9601_tx_fixup, |