diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/net/usb/net1080.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'drivers/net/usb/net1080.c')
| -rw-r--r-- | drivers/net/usb/net1080.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/usb/net1080.c b/drivers/net/usb/net1080.c index ba72a7281cb0..01db4602a39e 100644 --- a/drivers/net/usb/net1080.c +++ b/drivers/net/usb/net1080.c | |||
| @@ -560,7 +560,7 @@ static int net1080_bind(struct usbnet *dev, struct usb_interface *intf) | |||
| 560 | 560 | ||
| 561 | static const struct driver_info net1080_info = { | 561 | static const struct driver_info net1080_info = { |
| 562 | .description = "NetChip TurboCONNECT", | 562 | .description = "NetChip TurboCONNECT", |
| 563 | .flags = FLAG_FRAMING_NC, | 563 | .flags = FLAG_POINTTOPOINT | FLAG_FRAMING_NC, |
| 564 | .bind = net1080_bind, | 564 | .bind = net1080_bind, |
| 565 | .reset = net1080_reset, | 565 | .reset = net1080_reset, |
| 566 | .check_connect = net1080_check_connect, | 566 | .check_connect = net1080_check_connect, |