diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2010-01-29 22:53:44 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2010-01-29 22:53:44 +0000 |
| commit | 281372f547ceefd5930b5278362a52f024c7dfbc (patch) | |
| tree | 6728ac6bbd92609b7b65966e66d42b8024f158e8 /package/mac80211/patches/100-disable_pcmcia_compat.patch | |
| parent | d20644bc8f55f87460fab89822c919e76ddbf603 (diff) | |
| download | master-187ad058-281372f547ceefd5930b5278362a52f024c7dfbc.tar.gz master-187ad058-281372f547ceefd5930b5278362a52f024c7dfbc.tar.bz2 master-187ad058-281372f547ceefd5930b5278362a52f024c7dfbc.zip | |
[mac80211] compat should not depend on pcmcia or usb
remove pcmcia and usb backport form compat.ko
If an with usb or pcmcia module not directly included into the image is build all wireless packages depend on usb and pcmcia.
This hopefully fixes #6586
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19389 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.patch | 67 |
1 files changed, 67 insertions, 0 deletions
diff --git a/package/mac80211/patches/100-disable_pcmcia_compat.patch b/package/mac80211/patches/100-disable_pcmcia_compat.patch new file mode 100644 index 0000000000..f8170832f9 --- /dev/null +++ b/package/mac80211/patches/100-disable_pcmcia_compat.patch @@ -0,0 +1,67 @@ +--- a/compat/compat-2.6.28.c ++++ b/compat/compat-2.6.28.c +@@ -87,7 +87,7 @@ EXPORT_SYMBOL_GPL(usb_poison_urb); + #endif + #endif /* CONFIG_USB */ + +-#if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE) ++#if 0 + + #include <pcmcia/ds.h> + struct pcmcia_cfg_mem { +--- a/compat/compat-2.6.33.c ++++ b/compat/compat-2.6.33.c +@@ -14,7 +14,7 @@ + + #include <linux/autoconf.h> + +-#if defined(CONFIG_PCCARD) || defined(CONFIG_PCCARD_MODULE) ++#if 0 + + /** + * pccard_loop_tuple() - loop over tuples in the CIS +@@ -76,7 +76,7 @@ next_entry: + EXPORT_SYMBOL(pccard_loop_tuple); + /* Source: drivers/pcmcia/cistpl.c */ + +-#if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE) ++#if 0 + + struct pcmcia_loop_mem { + struct pcmcia_device *p_dev; +--- a/include/linux/compat-2.6.28.h ++++ b/include/linux/compat-2.6.28.h +@@ -27,7 +27,7 @@ + }) + #endif /* From include/asm-generic/bug.h */ + +-#if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE) ++#if 0 + + #include <pcmcia/cs_types.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)) + + #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> +@@ -68,9 +68,9 @@ static inline struct sk_buff *netdev_all + return skb; + } + +-#if defined(CONFIG_PCCARD) || defined(CONFIG_PCCARD_MODULE) ++#if 0 + +-#if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE) ++#if 0 + + #define pcmcia_request_window(a, b, c) pcmcia_request_window(&a, b, c) + |