From 9a59b350b7587eae4bcf6091b4dc86a4ee92bcf6 Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Wed, 17 Jun 2015 09:54:55 +0000 Subject: kernel: update 3.18 to 3.18.16 Changelogs: * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.15 * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.16 Signed-off-by: Jonas Gorski SVN-Revision: 46011 --- ...bcma-add-support-for-controlling-bus-power-throu.patch | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'target/linux/bcm53xx/patches-3.18/185-USB-bcma-add-support-for-controlling-bus-power-throu.patch') diff --git a/target/linux/bcm53xx/patches-3.18/185-USB-bcma-add-support-for-controlling-bus-power-throu.patch b/target/linux/bcm53xx/patches-3.18/185-USB-bcma-add-support-for-controlling-bus-power-throu.patch index 8a00141b8f..d9a8a1e621 100644 --- a/target/linux/bcm53xx/patches-3.18/185-USB-bcma-add-support-for-controlling-bus-power-throu.patch +++ b/target/linux/bcm53xx/patches-3.18/185-USB-bcma-add-support-for-controlling-bus-power-throu.patch @@ -12,8 +12,6 @@ Signed-off-by: Hauke Mehrtens drivers/usb/host/bcma-hcd.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) -diff --git a/drivers/usb/host/bcma-hcd.c b/drivers/usb/host/bcma-hcd.c -index 983bc67..a01c6ce 100644 --- a/drivers/usb/host/bcma-hcd.c +++ b/drivers/usb/host/bcma-hcd.c @@ -24,6 +24,8 @@ @@ -25,7 +23,7 @@ index 983bc67..a01c6ce 100644 #include #include -@@ -224,6 +226,23 @@ static void bcma_hcd_init_chip_arm(struct bcma_device *dev) +@@ -224,6 +226,23 @@ static void bcma_hcd_init_chip_arm(struc } } @@ -49,7 +47,7 @@ index 983bc67..a01c6ce 100644 static const struct usb_ehci_pdata ehci_pdata = { }; -@@ -295,6 +314,8 @@ static int bcma_hcd_probe(struct bcma_device *dev) +@@ -295,6 +314,8 @@ static int bcma_hcd_probe(struct bcma_de if (!usb_dev) return -ENOMEM; @@ -58,7 +56,7 @@ index 983bc67..a01c6ce 100644 switch (dev->id.id) { case BCMA_CORE_NS_USB20: bcma_hcd_init_chip_arm(dev); -@@ -347,6 +368,7 @@ static void bcma_hcd_remove(struct bcma_device *dev) +@@ -347,6 +368,7 @@ static void bcma_hcd_remove(struct bcma_ static void bcma_hcd_shutdown(struct bcma_device *dev) { @@ -66,7 +64,7 @@ index 983bc67..a01c6ce 100644 bcma_core_disable(dev, 0); } -@@ -354,6 +376,7 @@ static void bcma_hcd_shutdown(struct bcma_device *dev) +@@ -354,6 +376,7 @@ static void bcma_hcd_shutdown(struct bcm static int bcma_hcd_suspend(struct bcma_device *dev) { @@ -74,7 +72,7 @@ index 983bc67..a01c6ce 100644 bcma_core_disable(dev, 0); return 0; -@@ -361,6 +384,7 @@ static int bcma_hcd_suspend(struct bcma_device *dev) +@@ -361,6 +384,7 @@ static int bcma_hcd_suspend(struct bcma_ static int bcma_hcd_resume(struct bcma_device *dev) { @@ -82,6 +80,3 @@ index 983bc67..a01c6ce 100644 bcma_core_enable(dev, 0); return 0; --- -1.8.4.5 - -- cgit v1.2.3