diff options
| author | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
| commit | b32e3dc7860d00124fa432dba09667e647cb9bcc (patch) | |
| tree | 2fa6e56f389431dfb84609d3d7572cad76e88e71 /drivers/net/usb/net1080.c | |
| parent | 6604271c5bc658a6067ed0c3deba4d89e0e50382 (diff) | |
| parent | 96120d86fe302c006259baee9061eea9e1b9e486 (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
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, |