summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_mwifiex_sdio.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-11-21 17:53:08 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2013-11-21 23:34:58 +0100
commit92ad5c2ee4e441b0b366698d77facbf0258e59ad (patch)
treea67c2840a8b093d4ef583c64f2963f4ecb50c30b /patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_mwifiex_sdio.patch
parentbf4ede990a6d26d93e760d2b98065a4afaaefbd5 (diff)
backports: refresh on next-20131121backports-20131121
== 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.17 [ OK ] 20 3.11.6 [ OK ] 21 3.12-rc7 [ OK ] 22 3.2.52 [ OK ] 23 3.3.8 [ OK ] 24 3.4.67 [ OK ] 25 3.5.7 [ OK ] 26 3.6.11 [ OK ] 27 3.7.10 [ OK ] 28 3.8.13 [ OK ] 29 3.9.11 [ OK ] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_mwifiex_sdio.patch')
-rw-r--r--patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_mwifiex_sdio.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_mwifiex_sdio.patch b/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_mwifiex_sdio.patch
index 3dc2888b..11a30396 100644
--- a/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_mwifiex_sdio.patch
+++ b/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_mwifiex_sdio.patch
@@ -11,15 +11,15 @@
for (i = 0; i < adapter->priv_num; i++)
if ((GET_BSS_ROLE(adapter->priv[i]) ==
-@@ -201,6 +203,7 @@ mwifiex_sdio_remove(struct sdio_func *fu
- kfree(card);
+@@ -200,6 +202,7 @@ mwifiex_sdio_remove(struct sdio_func *fu
+ mwifiex_remove_card(card->adapter, &add_remove_card_sem);
}
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))
/*
* SDIO suspend.
*
-@@ -255,6 +258,7 @@ static int mwifiex_sdio_suspend(struct d
+@@ -254,6 +257,7 @@ static int mwifiex_sdio_suspend(struct d
return ret;
}
@@ -27,7 +27,7 @@
/* Device ID for SD8786 */
#define SDIO_DEVICE_ID_MARVELL_8786 (0x9116)
-@@ -280,10 +284,12 @@ static const struct sdio_device_id mwifi
+@@ -279,10 +283,12 @@ static const struct sdio_device_id mwifi
MODULE_DEVICE_TABLE(sdio, mwifiex_ids);
@@ -40,7 +40,7 @@
static struct sdio_driver mwifiex_sdio = {
.name = "mwifiex_sdio",
-@@ -292,7 +298,9 @@ static struct sdio_driver mwifiex_sdio =
+@@ -291,7 +297,9 @@ static struct sdio_driver mwifiex_sdio =
.remove = mwifiex_sdio_remove,
.drv = {
.owner = THIS_MODULE,