summaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/100-disable_pcmcia_compat.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-07-27 21:04:54 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-07-27 21:04:54 +0000
commitf7ff2aed8b863cf6a639ff5e487307eabc8712f1 (patch)
tree52aab3eb277ba5567e6c8286b16d95acbb8a1ccc /package/mac80211/patches/100-disable_pcmcia_compat.patch
parentbffb902a108b8cb5925546dfe48e5071d1124b8a (diff)
mac80211: update to wireless-testing 2010-07-26 + pending patches - adds a change that might fix some calibration issues
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22403 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 8b366ff93..ebfe5ce65 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;
}