diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-21 09:59:23 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-21 09:59:23 -0700 |
| commit | cda4db53e9c28061c100400e1a4d273ea61dfba9 (patch) | |
| tree | 42fe432a412fdbd2313d3d0270b53e0877594316 /drivers/net | |
| parent | 8e192910d96615a32646b8978b201b650f62ef34 (diff) | |
| parent | c88db160a30cccb81303212b256680f2e37e35ae (diff) | |
| download | linux-cda4db53e9c28061c100400e1a4d273ea61dfba9.tar.gz linux-cda4db53e9c28061c100400e1a4d273ea61dfba9.tar.bz2 linux-cda4db53e9c28061c100400e1a4d273ea61dfba9.zip | |
Merge tag 'for-usb-next-2012-05-21' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci into usb-next
xhci/usb: Build error fixes for 3.5
Hi Greg,
Here's four patches that fix the build errors introduced by the USB 3.0 Link PM
patches. Please pull for inclusion in 3.5.
Sarah Sharp
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/usb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/brcm80211/brcmfmac/usb.c index 8852d23ef829..f2bc48b745ea 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/usb.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/usb.c @@ -1604,7 +1604,7 @@ static struct usb_driver brcmf_usbdrvr = { .id_table = brcmf_usb_devid_table, .suspend = brcmf_usb_suspend, .resume = brcmf_usb_resume, - .supports_autosuspend = 1 + .supports_autosuspend = 1, .disable_hub_initiated_lpm = 1, }; |