From 34ad7f6499be7e2190d8fd92423ab92a9d8f4a22 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 15 May 2010 15:56:51 +0000
Subject: 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
---
 .../600-rt2x00-disable-pci-code-if-CONFIG_PCI-not-defined.patch       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to '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 8da8cb5da..cea88ae63 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 */
-- 
cgit v1.2.3