From 988d789ee711fc376210f8917fb3b062b96d4de8 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 24 Nov 2013 14:46:47 +0100 Subject: backports: refresh on v3.13-rc1 == ckmake-report.log == 1 2.6.24 [ FAIL ] 2 2.6.25 [ OK ] 3 2.6.26 [ OK ] 4 2.6.27 [ OK ] 5 2.6.28 [ OK ] 6 2.6.29 [ OK ] 7 2.6.30 [ OK ] 8 2.6.31 [ OK ] 9 2.6.32 [ OK ] 10 2.6.33 [ OK ] 11 2.6.34 [ OK ] 12 2.6.35 [ OK ] 13 2.6.36 [ OK ] 14 2.6.37 [ OK ] 15 2.6.38 [ OK ] 16 2.6.39 [ OK ] 17 3.0.101 [ OK ] 18 3.1.10 [ OK ] 19 3.10.20 [ OK ] 20 3.11.9 [ OK ] 21 3.12.1 [ OK ] 22 3.13-rc1 [ OK ] 23 3.2.52 [ OK ] 24 3.3.8 [ OK ] 25 3.4.70 [ OK ] 26 3.5.7 [ OK ] 27 3.6.11 [ OK ] 28 3.7.10 [ OK ] 29 3.8.13 [ OK ] 30 3.9.11 [ OK ] Signed-off-by: Hauke Mehrtens --- .../network/29-sdio_no_suspend/drivers_bluetooth_btmrvl_sdio.patch | 6 +++--- .../network/62-usb_driver_lpm/drivers_bluetooth_ath3k.patch | 2 +- .../network/62-usb_driver_lpm/drivers_bluetooth_btusb.patch | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_bluetooth_btmrvl_sdio.patch b/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_bluetooth_btmrvl_sdio.patch index 5d0023b8..f7046b8a 100644 --- a/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_bluetooth_btmrvl_sdio.patch +++ b/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_bluetooth_btmrvl_sdio.patch @@ -1,6 +1,6 @@ --- a/drivers/bluetooth/btmrvl_sdio.c +++ b/drivers/bluetooth/btmrvl_sdio.c -@@ -1075,6 +1075,7 @@ static void btmrvl_sdio_remove(struct sd +@@ -1081,6 +1081,7 @@ static void btmrvl_sdio_remove(struct sd } } @@ -8,7 +8,7 @@ static int btmrvl_sdio_suspend(struct device *dev) { struct sdio_func *func = dev_to_sdio_func(dev); -@@ -1170,6 +1171,7 @@ static const struct dev_pm_ops btmrvl_sd +@@ -1176,6 +1177,7 @@ static const struct dev_pm_ops btmrvl_sd .suspend = btmrvl_sdio_suspend, .resume = btmrvl_sdio_resume, }; @@ -16,7 +16,7 @@ static struct sdio_driver bt_mrvl_sdio = { .name = "btmrvl_sdio", -@@ -1178,7 +1180,9 @@ static struct sdio_driver bt_mrvl_sdio = +@@ -1184,7 +1186,9 @@ static struct sdio_driver bt_mrvl_sdio = .remove = btmrvl_sdio_remove, .drv = { .owner = THIS_MODULE, diff --git a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_ath3k.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_ath3k.patch index cbe44c23..d70c24b3 100644 --- a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_ath3k.patch +++ b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_ath3k.patch @@ -1,6 +1,6 @@ --- a/drivers/bluetooth/ath3k.c +++ b/drivers/bluetooth/ath3k.c -@@ -507,7 +507,9 @@ static struct usb_driver ath3k_driver = +@@ -503,7 +503,9 @@ static struct usb_driver ath3k_driver = .probe = ath3k_probe, .disconnect = ath3k_disconnect, .id_table = ath3k_table, diff --git a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_btusb.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_btusb.patch index 73bea262..5c57bf87 100644 --- a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_btusb.patch +++ b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_btusb.patch @@ -1,6 +1,6 @@ --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c -@@ -1637,7 +1637,9 @@ static struct usb_driver btusb_driver = +@@ -1632,7 +1632,9 @@ static struct usb_driver btusb_driver = #endif .id_table = btusb_table, .supports_autosuspend = 1, -- cgit v1.2.3