ar71xx: merge 3.2 fixes

[openwrt.git] / 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 a88d1f5..fb5ae7d 100644 (file)
--- a/package/mac80211/patches/100-disable_pcmcia_compat.patch
+++ b/package/mac80211/patches/100-disable_pcmcia_compat.patch
@@ -42,16 +42,16 @@
  #include <pcmcia/cs.h>
 --- a/include/linux/compat-2.6.33.h
 +++ b/include/linux/compat-2.6.33.h
-@@ -6,7 +6,7 @@
- #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33))
+@@ -7,7 +7,7 @@
  
  #include <linux/skbuff.h>
+ #include <linux/pci.h>
 -#if defined(CONFIG_PCCARD) || defined(CONFIG_PCCARD_MODULE)
 +#if 0
  #include <pcmcia/cs_types.h>
  #include <pcmcia/cistpl.h>
  #include <pcmcia/ds.h>
-@@ -65,9 +65,9 @@ static inline struct sk_buff *netdev_all
+@@ -74,9 +74,9 @@ static inline struct sk_buff *netdev_all
        return skb;
  }