aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/sunxi/patches-3.14/195-4-xhci-plat-changes.patch
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2014-09-10 21:40:19 +0000
committerLuka Perkov <luka@openwrt.org>2014-09-10 21:40:19 +0000
commite5441232a81d01e2ed46d88e340a30fd6b15b012 (patch)
treee008cc6bd24a0e2c9b283d94a69f7a027bcfb856 /target/linux/sunxi/patches-3.14/195-4-xhci-plat-changes.patch
parent048910c4e07b6fae28513ce1dea62fe3b6bb03de (diff)
downloadmaster-187ad058-e5441232a81d01e2ed46d88e340a30fd6b15b012.tar.gz
master-187ad058-e5441232a81d01e2ed46d88e340a30fd6b15b012.tar.bz2
master-187ad058-e5441232a81d01e2ed46d88e340a30fd6b15b012.zip
kernel: update 3.14 to 3.14.18
Targets were build tested and patches are refreshed. Signed-off-by: Luka Perkov <luka@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42463 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/sunxi/patches-3.14/195-4-xhci-plat-changes.patch')
-rw-r--r--target/linux/sunxi/patches-3.14/195-4-xhci-plat-changes.patch9
1 files changed, 1 insertions, 8 deletions
diff --git a/target/linux/sunxi/patches-3.14/195-4-xhci-plat-changes.patch b/target/linux/sunxi/patches-3.14/195-4-xhci-plat-changes.patch
index 81dc4d4642..202bdd0bb8 100644
--- a/target/linux/sunxi/patches-3.14/195-4-xhci-plat-changes.patch
+++ b/target/linux/sunxi/patches-3.14/195-4-xhci-plat-changes.patch
@@ -18,8 +18,6 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
drivers/usb/host/xhci-plat.c | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
-diff --git a/Documentation/devicetree/bindings/usb/usb-xhci.txt b/Documentation/devicetree/bindings/usb/usb-xhci.txt
-index 5752df0..90f8f60 100644
--- a/Documentation/devicetree/bindings/usb/usb-xhci.txt
+++ b/Documentation/devicetree/bindings/usb/usb-xhci.txt
@@ -1,14 +1,14 @@
@@ -39,11 +37,9 @@ index 5752df0..90f8f60 100644
reg = <0xf0931000 0x8c8>;
interrupts = <0x0 0x4e 0x0>;
};
-diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
-index 8abda5c..8affef9 100644
--- a/drivers/usb/host/xhci-plat.c
+++ b/drivers/usb/host/xhci-plat.c
-@@ -226,6 +226,7 @@ static const struct dev_pm_ops xhci_plat_pm_ops = {
+@@ -226,6 +226,7 @@ static const struct dev_pm_ops xhci_plat
#ifdef CONFIG_OF
static const struct of_device_id usb_xhci_of_match[] = {
@@ -51,6 +47,3 @@ index 8abda5c..8affef9 100644
{ .compatible = "xhci-platform" },
{ },
};
---
-2.0.3
-