diff options
| author | David S. Miller <davem@davemloft.net> | 2013-05-24 19:48:28 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-05-24 19:48:28 -0400 |
| commit | e6ff4c75f9095f61b3a66c2a78e47b62864022dd (patch) | |
| tree | 425ea9463cbec0b1975b8a33d9a56817143055d0 /drivers/usb/gadget/f_subset.c | |
| parent | ee9c799c231324de681eb21e06d8bf4842768b75 (diff) | |
| parent | 0e255f1c0c9add2f0c920240ac4cadc28ae274c3 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Merge net into net-next because some upcoming net-next changes
build on top of bug fixes that went into net.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/usb/gadget/f_subset.c')
| -rw-r--r-- | drivers/usb/gadget/f_subset.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/gadget/f_subset.c b/drivers/usb/gadget/f_subset.c index 185d6f5e4e4d..7be04b342494 100644 --- a/drivers/usb/gadget/f_subset.c +++ b/drivers/usb/gadget/f_subset.c | |||
| @@ -373,6 +373,7 @@ geth_unbind(struct usb_configuration *c, struct usb_function *f) | |||
| 373 | * @c: the configuration to support the network link | 373 | * @c: the configuration to support the network link |
| 374 | * @ethaddr: a buffer in which the ethernet address of the host side | 374 | * @ethaddr: a buffer in which the ethernet address of the host side |
| 375 | * side of the link was recorded | 375 | * side of the link was recorded |
| 376 | * @dev: eth_dev structure | ||
| 376 | * Context: single threaded during gadget setup | 377 | * Context: single threaded during gadget setup |
| 377 | * | 378 | * |
| 378 | * Returns zero on success, else negative errno. | 379 | * Returns zero on success, else negative errno. |