diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-02-06 09:32:06 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-02-06 09:32:06 +0100 |
| commit | 7bddba775026d51dede9d726bd8158574c0ec5a6 (patch) | |
| tree | 6ec6b7cfd9ef9a7915bf1f4ce13cff1d3944694f /drivers/usb/musb/musb_core.h | |
| parent | Merge tag 'usb-ci-v4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb into usb-next (diff) | |
| parent | Linux 4.10-rc7 (diff) | |
| download | linux-dev-7bddba775026d51dede9d726bd8158574c0ec5a6.tar.xz linux-dev-7bddba775026d51dede9d726bd8158574c0ec5a6.zip | |
Merge 4.10-rc7 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/musb/musb_core.h')
| -rw-r--r-- | drivers/usb/musb/musb_core.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h index ab0c858af9d3..5b708be6d1d1 100644 --- a/drivers/usb/musb/musb_core.h +++ b/drivers/usb/musb/musb_core.h @@ -411,7 +411,6 @@ struct musb { /* is_suspended means USB B_PERIPHERAL suspend */ unsigned is_suspended:1; - unsigned need_finish_resume :1; /* may_wakeup means remote wakeup is enabled */ unsigned may_wakeup:1; |