diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-10-30 14:39:02 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-10-30 14:39:02 -0400 |
| commit | 31271e9aacaa3c3460cbad8ec62fb5a04a522f5b (patch) | |
| tree | 815c671dac14e0e07959dc88e94c36a994f9c460 /drivers/net/wireless/rt2x00/rt2800usb.c | |
| parent | 32111abb508424d1d110fa471d940160abe251f5 (diff) | |
| parent | dc4dc36056392c0b0b1ca9e81bebff964b9297e0 (diff) | |
Merge branch 'spi-tegra' into spi-next
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2800usb.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2800usb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c index c9e9370eb789..3b8fb5a603f2 100644 --- a/drivers/net/wireless/rt2x00/rt2800usb.c +++ b/drivers/net/wireless/rt2x00/rt2800usb.c | |||
| @@ -1282,6 +1282,7 @@ static struct usb_driver rt2800usb_driver = { | |||
| 1282 | .disconnect = rt2x00usb_disconnect, | 1282 | .disconnect = rt2x00usb_disconnect, |
| 1283 | .suspend = rt2x00usb_suspend, | 1283 | .suspend = rt2x00usb_suspend, |
| 1284 | .resume = rt2x00usb_resume, | 1284 | .resume = rt2x00usb_resume, |
| 1285 | .reset_resume = rt2x00usb_resume, | ||
| 1285 | .disable_hub_initiated_lpm = 1, | 1286 | .disable_hub_initiated_lpm = 1, |
| 1286 | }; | 1287 | }; |
| 1287 | 1288 | ||