Ignore:
Timestamp:
2010-08-04T19:29:05+02:00 (6 years ago)
Author:
nbd
Message:

mac80211: merge changes from latest trunk into backfire

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/backfire/package/mac80211/patches/100-disable_pcmcia_compat.patch

    r21649 r22494  
    4343--- a/include/linux/compat-2.6.33.h 
    4444+++ b/include/linux/compat-2.6.33.h 
    45 @@ -6,8 +6,8 @@ 
     45@@ -6,7 +6,7 @@ 
    4646 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)) 
    4747  
    4848 #include <linux/skbuff.h> 
    4949-#if defined(CONFIG_PCCARD) || defined(CONFIG_PCCARD_MODULE) 
    50 -#if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE) 
    51 +#if 0 
    5250+#if 0 
    5351 #include <pcmcia/cs_types.h> 
    5452 #include <pcmcia/cistpl.h> 
    5553 #include <pcmcia/ds.h> 
    56 @@ -67,9 +67,9 @@ static inline struct sk_buff *netdev_all 
     54@@ -65,9 +65,9 @@ static inline struct sk_buff *netdev_all 
    5755        return skb; 
    5856 } 
Note: See TracChangeset for help on using the changeset viewer.