diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-02-17 22:00:57 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-02-17 22:00:57 +0400 |
| commit | 8393ea14076dbda27010fcabcff5e2d40f0bfb1f (patch) | |
| tree | a980405258207f6a0d0edfc78ae07fb652bf54e1 /drivers/usb/gadget/ether.c | |
| parent | 49561d58a14351d136518f25bd686f9a6ca41b69 (diff) | |
| parent | 1a20977eb1ba05d3e1a20f1e81a830a876fdb054 (diff) | |
Merge branch 'linaro-android-3.3-agreen-rebase' into linaro-android
Diffstat (limited to 'drivers/usb/gadget/ether.c')
| -rw-r--r-- | drivers/usb/gadget/ether.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c index a28f6ffcd0f..8031bfdff2b 100644 --- a/drivers/usb/gadget/ether.c +++ b/drivers/usb/gadget/ether.c @@ -237,7 +237,7 @@ static int __init rndis_do_config(struct usb_configuration *c) c->bmAttributes |= USB_CONFIG_ATT_WAKEUP; } - return rndis_bind_config(c, hostaddr); + return rndis_bind_config(c, hostaddr, 0, manufacturer); } static struct usb_configuration rndis_config_driver = { |