diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2014-02-23 10:59:40 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2014-02-23 10:59:40 +0000 |
| commit | f677b1bc7e37642eb1c42d3068ff3c44eb5ed3cb (patch) | |
| tree | a4971798ff33bb5e653297f14906628b84407790 /target/linux/mvebu/patches-3.10/0197-xhci-fix-dma-mask-setup-in-xhci.c.patch | |
| parent | 6c8300df3d593abd911a3d6bb1a95eee4cfd06f8 (diff) | |
| download | upstream-f677b1bc7e37642eb1c42d3068ff3c44eb5ed3cb.tar.gz upstream-f677b1bc7e37642eb1c42d3068ff3c44eb5ed3cb.tar.bz2 upstream-f677b1bc7e37642eb1c42d3068ff3c44eb5ed3cb.zip | |
kernel: update 3.10 to 3.10.32
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 39707
Diffstat (limited to 'target/linux/mvebu/patches-3.10/0197-xhci-fix-dma-mask-setup-in-xhci.c.patch')
| -rw-r--r-- | target/linux/mvebu/patches-3.10/0197-xhci-fix-dma-mask-setup-in-xhci.c.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/mvebu/patches-3.10/0197-xhci-fix-dma-mask-setup-in-xhci.c.patch b/target/linux/mvebu/patches-3.10/0197-xhci-fix-dma-mask-setup-in-xhci.c.patch index 84fcbafb5b..1d2e18b52f 100644 --- a/target/linux/mvebu/patches-3.10/0197-xhci-fix-dma-mask-setup-in-xhci.c.patch +++ b/target/linux/mvebu/patches-3.10/0197-xhci-fix-dma-mask-setup-in-xhci.c.patch @@ -81,7 +81,7 @@ Conflicts: return -ENOMEM; --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -4654,7 +4654,6 @@ int xhci_gen_setup(struct usb_hcd *hcd, +@@ -4657,7 +4657,6 @@ int xhci_gen_setup(struct usb_hcd *hcd, struct xhci_hcd *xhci; struct device *dev = hcd->self.controller; int retval; @@ -89,7 +89,7 @@ Conflicts: /* Accept arbitrarily long scatter-gather lists */ hcd->self.sg_tablesize = ~0; -@@ -4682,14 +4681,6 @@ int xhci_gen_setup(struct usb_hcd *hcd, +@@ -4685,14 +4684,6 @@ int xhci_gen_setup(struct usb_hcd *hcd, /* xHCI private pointer was set in xhci_pci_probe for the second * registered roothub. */ @@ -104,7 +104,7 @@ Conflicts: return 0; } -@@ -4728,12 +4719,12 @@ int xhci_gen_setup(struct usb_hcd *hcd, +@@ -4731,12 +4722,12 @@ int xhci_gen_setup(struct usb_hcd *hcd, goto error; xhci_dbg(xhci, "Reset complete\n"); |