aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/600-rt2x00-disable-pci-code-if-CONFIG_PCI-not-defined.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-05-15 15:56:51 +0000
committerFelix Fietkau <nbd@openwrt.org>2010-05-15 15:56:51 +0000
commita39655c7fcc8e45815b07e88f254b7f831e56dee (patch)
treed38fecd4bf967fac0c49d6d2cbdc4aa93792b5a7 /package/mac80211/patches/600-rt2x00-disable-pci-code-if-CONFIG_PCI-not-defined.patch
parent6a4f17a03625c72b2d2835be84e6c971ed611930 (diff)
downloadupstream-a39655c7fcc8e45815b07e88f254b7f831e56dee.tar.gz
upstream-a39655c7fcc8e45815b07e88f254b7f831e56dee.tar.bz2
upstream-a39655c7fcc8e45815b07e88f254b7f831e56dee.zip
mac80211: update to wireless-testing 2010-05-12 plus some pending patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21454 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/600-rt2x00-disable-pci-code-if-CONFIG_PCI-not-defined.patch')
-rw-r--r--package/mac80211/patches/600-rt2x00-disable-pci-code-if-CONFIG_PCI-not-defined.patch4
1 files changed, 2 insertions, 2 deletions
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 8da8cb5da7..cea88ae63a 100644
--- 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
-@@ -225,6 +225,7 @@ void rt2x00pci_uninitialize(struct rt2x0
+@@ -216,6 +216,7 @@ void rt2x00pci_uninitialize(struct rt2x0
}
EXPORT_SYMBOL_GPL(rt2x00pci_uninitialize);
@@ -8,7 +8,7 @@
/*
* PCI driver handlers.
*/
-@@ -399,6 +400,7 @@ int rt2x00pci_resume(struct pci_dev *pci
+@@ -390,6 +391,7 @@ int rt2x00pci_resume(struct pci_dev *pci
}
EXPORT_SYMBOL_GPL(rt2x00pci_resume);
#endif /* CONFIG_PM */