aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/100-disable_pcmcia_compat.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-07-27 21:04:54 +0000
committerFelix Fietkau <nbd@openwrt.org>2010-07-27 21:04:54 +0000
commit0e417cf3ce3fc469106548491c9d9c19ddae45d0 (patch)
tree7bc9557a2d205491d94c6893c347699170985594 /package/mac80211/patches/100-disable_pcmcia_compat.patch
parent7a5f143f64aa4b4016c29992b0eaa956da86eef6 (diff)
downloadupstream-0e417cf3ce3fc469106548491c9d9c19ddae45d0.tar.gz
upstream-0e417cf3ce3fc469106548491c9d9c19ddae45d0.tar.bz2
upstream-0e417cf3ce3fc469106548491c9d9c19ddae45d0.zip
mac80211: update to wireless-testing 2010-07-26 + pending patches - adds a change that might fix some calibration issues
SVN-Revision: 22403
Diffstat (limited to 'package/mac80211/patches/100-disable_pcmcia_compat.patch')
-rw-r--r--package/mac80211/patches/100-disable_pcmcia_compat.patch6
1 files changed, 2 insertions, 4 deletions
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;
}