diff options
| author | Greg Kroah-Hartman | 2017-10-23 14:24:37 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2017-10-23 14:24:37 +0200 |
| commit | 0520d37bb3d49f8e62e30c80b001e0003b3f3ca9 (patch) | |
| tree | decc3a87d59b4eec5ec8c8c9c3f8378c35a29c7b /drivers/usb/musb/musb_core.h | |
| parent | USB: Force disconnect Huawei 4G modem during suspend (diff) | |
| parent | Linux 4.14-rc6 (diff) | |
| download | kernel-qcow2-linux-0520d37bb3d49f8e62e30c80b001e0003b3f3ca9.tar.gz kernel-qcow2-linux-0520d37bb3d49f8e62e30c80b001e0003b3f3ca9.tar.xz kernel-qcow2-linux-0520d37bb3d49f8e62e30c80b001e0003b3f3ca9.zip | |
Merge 4.14-rc6 into usb-next
We need 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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h index c748f4ac1154..20f4614178d9 100644 --- a/drivers/usb/musb/musb_core.h +++ b/drivers/usb/musb/musb_core.h @@ -428,6 +428,8 @@ struct musb { unsigned test_mode:1; unsigned softconnect:1; + unsigned flush_irq_work:1; + u8 address; u8 test_mode_nr; u16 ackpend; /* ep0 */ |