diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-04-07 14:15:50 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-04-07 14:15:50 -0400 |
| commit | 454abcc57f1d48a976291bc4af73b5f087e21d70 (patch) | |
| tree | 5bba999ea3f31527da02b60604531cc5fb52ea57 /drivers/net/usb/plusb.c | |
| parent | 88aab9341a315d81118be6b41c45e4fe32b94bc1 (diff) | |
| parent | 6221f222c0ebf1acdf7abcf927178f40e1a65e2a (diff) | |
Merge commit 'v2.6.39-rc2' into spi/merge
Diffstat (limited to 'drivers/net/usb/plusb.c')
| -rw-r--r-- | drivers/net/usb/plusb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/usb/plusb.c b/drivers/net/usb/plusb.c index 08ad269f6b4e..823c53751307 100644 --- a/drivers/net/usb/plusb.c +++ b/drivers/net/usb/plusb.c | |||
| @@ -96,7 +96,7 @@ static int pl_reset(struct usbnet *dev) | |||
| 96 | 96 | ||
| 97 | static const struct driver_info prolific_info = { | 97 | static const struct driver_info prolific_info = { |
| 98 | .description = "Prolific PL-2301/PL-2302", | 98 | .description = "Prolific PL-2301/PL-2302", |
| 99 | .flags = FLAG_NO_SETINT, | 99 | .flags = FLAG_POINTTOPOINT | FLAG_NO_SETINT, |
| 100 | /* some PL-2302 versions seem to fail usb_set_interface() */ | 100 | /* some PL-2302 versions seem to fail usb_set_interface() */ |
| 101 | .reset = pl_reset, | 101 | .reset = pl_reset, |
| 102 | }; | 102 | }; |