mac80211: update to wireless-testing 2010-01-19

[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 7e5450a..99f250a 100644 (file)
--- a/package/mac80211/patches/100-disable_pcmcia_compat.patch
+++ b/package/mac80211/patches/100-disable_pcmcia_compat.patch
@@ -1,6 +1,6 @@
 --- a/compat/compat-2.6.28.c
 +++ b/compat/compat-2.6.28.c
 --- a/compat/compat-2.6.28.c
 +++ b/compat/compat-2.6.28.c

-@@ -87,7 +87,7 @@ EXPORT_SYMBOL_GPL(usb_poison_urb);
+@@ -86,7 +86,7 @@ EXPORT_SYMBOL_GPL(usb_poison_urb);

  #endif
  #endif /* CONFIG_USB */
  
  #endif
  #endif /* CONFIG_USB */
  


@@ -11,8 +11,8 @@
  struct pcmcia_cfg_mem {
 --- a/compat/compat-2.6.33.c
 +++ b/compat/compat-2.6.33.c
  struct pcmcia_cfg_mem {
 --- a/compat/compat-2.6.33.c
 +++ b/compat/compat-2.6.33.c

-@@ -14,7 +14,7 @@
- 
+@@ -11,7 +11,7 @@
+ #include <linux/compat.h>

  #include <linux/autoconf.h>
  
 -#if defined(CONFIG_PCCARD) || defined(CONFIG_PCCARD_MODULE)
  #include <linux/autoconf.h>
  
 -#if defined(CONFIG_PCCARD) || defined(CONFIG_PCCARD_MODULE)


@@ -20,7 +20,7 @@
  
  /**
   * pccard_loop_tuple() - loop over tuples in the CIS
  
  /**
   * pccard_loop_tuple() - loop over tuples in the CIS

-@@ -76,7 +76,7 @@ next_entry:
+@@ -73,7 +73,7 @@ next_entry:

  EXPORT_SYMBOL(pccard_loop_tuple);
  /* Source: drivers/pcmcia/cistpl.c */
  
  EXPORT_SYMBOL(pccard_loop_tuple);
  /* Source: drivers/pcmcia/cistpl.c */
  


@@ -42,18 +42,16 @@
  #include <pcmcia/cs.h>
 --- a/include/linux/compat-2.6.33.h
 +++ b/include/linux/compat-2.6.33.h
  #include <pcmcia/cs.h>
 --- a/include/linux/compat-2.6.33.h
 +++ b/include/linux/compat-2.6.33.h

-@@ -6,8 +6,8 @@
- #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33))
+@@ -7,7 +7,7 @@

  
  #include <linux/skbuff.h>
  
  #include <linux/skbuff.h>

+ #include <linux/pci.h>

 -#if defined(CONFIG_PCCARD) || defined(CONFIG_PCCARD_MODULE)
 -#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>
 +#if 0
  #include <pcmcia/cs_types.h>
  #include <pcmcia/cistpl.h>
  #include <pcmcia/ds.h>

-@@ -70,9 +70,9 @@ static inline struct sk_buff *netdev_all
+@@ -65,9 +65,9 @@ static inline struct sk_buff *netdev_all

        return skb;
  }
  
        return skb;
  }