cfg80211: do not overwrite the hardware max power setting in the regulatory code...

[openwrt.git] / package / mac80211 / patches / 600-rt2x00-disable-pci-code-if-CONFIG_PCI-not-defined.patch

diff --git a/package/mac80211/patches/600-rt2x00-disable-pci-code-if-CONFIG_PCI-not-defined.patch b/package/mac80211/patches/600-rt2x00-disable-pci-code-if-CONFIG_PCI-not-defined.patch
index 834793d..0378523 100644 (file)
--- a/package/mac80211/patches/600-rt2x00-disable-pci-code-if-CONFIG_PCI-not-defined.patch
+++ b/package/mac80211/patches/600-rt2x00-disable-pci-code-if-CONFIG_PCI-not-defined.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/rt2x00/rt2x00pci.c
 +++ b/drivers/net/wireless/rt2x00/rt2x00pci.c
 --- a/drivers/net/wireless/rt2x00/rt2x00pci.c
 +++ b/drivers/net/wireless/rt2x00/rt2x00pci.c

-@@ -224,6 +224,7 @@ void rt2x00pci_uninitialize(struct rt2x0
+@@ -209,6 +209,7 @@ void rt2x00pci_uninitialize(struct rt2x0

  }
  EXPORT_SYMBOL_GPL(rt2x00pci_uninitialize);
  
  }
  EXPORT_SYMBOL_GPL(rt2x00pci_uninitialize);
  


@@ -8,7 +8,7 @@
  /*
   * PCI driver handlers.
   */
  /*
   * PCI driver handlers.
   */

-@@ -398,6 +399,7 @@ int rt2x00pci_resume(struct pci_dev *pci
+@@ -388,6 +389,7 @@ int rt2x00pci_resume(struct pci_dev *pci

  }
  EXPORT_SYMBOL_GPL(rt2x00pci_resume);
  #endif /* CONFIG_PM */
  }
  EXPORT_SYMBOL_GPL(rt2x00pci_resume);
  #endif /* CONFIG_PM */