From 0e417cf3ce3fc469106548491c9d9c19ddae45d0 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 27 Jul 2010 21:04:54 +0000
Subject: mac80211: update to wireless-testing 2010-07-26 + pending patches -
 adds a change that might fix some calibration issues

SVN-Revision: 22403
---
 package/mac80211/patches/100-disable_pcmcia_compat.patch | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'package/mac80211/patches/100-disable_pcmcia_compat.patch')

diff --git a/package/mac80211/patches/100-disable_pcmcia_compat.patch b/package/mac80211/patches/100-disable_pcmcia_compat.patch
index 8b366ff936..ebfe5ce653 100644
--- a/package/mac80211/patches/100-disable_pcmcia_compat.patch
+++ b/package/mac80211/patches/100-disable_pcmcia_compat.patch
@@ -42,18 +42,16 @@
  #include <pcmcia/cs.h>
 --- a/include/linux/compat-2.6.33.h
 +++ b/include/linux/compat-2.6.33.h
-@@ -6,8 +6,8 @@
+@@ -6,7 +6,7 @@
  #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33))
  
  #include <linux/skbuff.h>
 -#if defined(CONFIG_PCCARD) || defined(CONFIG_PCCARD_MODULE)
--#if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE)
-+#if 0
 +#if 0
  #include <pcmcia/cs_types.h>
  #include <pcmcia/cistpl.h>
  #include <pcmcia/ds.h>
-@@ -67,9 +67,9 @@ static inline struct sk_buff *netdev_all
+@@ -65,9 +65,9 @@ static inline struct sk_buff *netdev_all
  	return skb;
  }
  
-- 
cgit v1.2.3