From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 9 Oct 2017 07:11:09 +0000 (+0200)
Subject: Merge 4.14-rc4 into usb-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4fcae770f3027abefd952c5d511ac6299828865a;p=linux.git

Merge 4.14-rc4 into usb-next

This merges in the USB fixes that we need here.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

4fcae770f3027abefd952c5d511ac6299828865a
diff --cc drivers/usb/host/xhci.h
index 7379309f4d1f8,2b48aa4f6b767..b966cd8783514
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@@ -1830,9 -1828,8 +1832,9 @@@ struct xhci_hcd 
  /* For controller with a broken Port Disable implementation */
  #define XHCI_BROKEN_PORT_PED	(1 << 25)
  #define XHCI_LIMIT_ENDPOINT_INTERVAL_7	(1 << 26)
- #define XHCI_U2_DISABLE_WAKE	(1 << 27)
+ /* Reserved. It was XHCI_U2_DISABLE_WAKE */
  #define XHCI_ASMEDIA_MODIFY_FLOWCONTROL	(1 << 28)
 +#define XHCI_HW_LPM_DISABLE	(1 << 29)
  
  	unsigned int		num_active_eps;
  	unsigned int		limit_active_eps;