compat-wireless: make patches apply again

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/patches/29-sdio_no_suspend.patch b/patches/29-sdio_no_suspend.patch
index 843e6173d10bc5f5c0fcaed60e53daa1deb549eb..ef14f08bd850d24b39a516e2063e0f390b08027f 100644 (file)
--- a/patches/29-sdio_no_suspend.patch
+++ b/patches/29-sdio_no_suspend.patch
@@ -86,7 +86,7 @@ suspend and resume that are not backported.
  
 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
 +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
-@@ -127,7 +127,7 @@ static int brcmf_ops_sdio_probe(struct s
+@@ -49,7 +49,7 @@ static int brcmf_ops_sdio_probe(struct s
                                const struct sdio_device_id *id);
  static void brcmf_ops_sdio_remove(struct sdio_func *func);
  
@@ -95,30 +95,30 @@ suspend and resume that are not backported.
  static int brcmf_sdio_suspend(struct device *dev);
  static int brcmf_sdio_resume(struct device *dev);
  #endif /* CONFIG_PM */
-@@ -157,7 +157,7 @@ static const struct sdio_device_id brcmf
+@@ -62,7 +62,7 @@ static const struct sdio_device_id brcmf
        { /* end: all zeroes */ },
  };
  
--#ifdef CONFIG_PM
-+#if defined(CONFIG_PM) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))
+-#ifdef CONFIG_PM_SLEEP
++#if defined(CONFIG_PM_SLEEP) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))
  static const struct dev_pm_ops brcmf_sdio_pm_ops = {
        .suspend        = brcmf_sdio_suspend,
        .resume         = brcmf_sdio_resume,
-@@ -169,7 +169,7 @@ static struct sdio_driver brcmf_sdmmc_dr
+@@ -74,7 +74,7 @@ static struct sdio_driver brcmf_sdmmc_dr
        .remove = brcmf_ops_sdio_remove,
        .name = "brcmfmac",
        .id_table = brcmf_sdmmc_ids,
--#ifdef CONFIG_PM
-+#if defined(CONFIG_PM) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))
+-#ifdef CONFIG_PM_SLEEP
++#if defined(CONFIG_PM_SLEEP) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))
        .drv = {
                .pm = &brcmf_sdio_pm_ops,
        },
-@@ -1081,7 +1081,7 @@ static void brcmf_ops_sdio_remove(struct
+@@ -640,7 +640,7 @@ static void brcmf_ops_sdio_remove(struct
  }
  
  
--#ifdef CONFIG_PM
-+#if defined(CONFIG_PM) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))
+-#ifdef CONFIG_PM_SLEEP
++#if defined(CONFIG_PM_SLEEP) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))
  static int brcmf_sdio_suspend(struct device *dev)
  {
        mmc_pm_flag_t sdio_flags;