From 3eefc261ffb7e8cfbb2f08d8be92dfe1ed47030a Mon Sep 17 00:00:00 2001
From: hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 29 Jan 2010 22:53:44 +0000
Subject: [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
---
 .../patches/100-disable_pcmcia_compat.patch        | 67 ++++++++++++++++++++++
 .../mac80211/patches/110-disable_usb_compat.patch  | 33 +++++++++++
 2 files changed, 100 insertions(+)
 create mode 100644 package/mac80211/patches/100-disable_pcmcia_compat.patch
 create mode 100644 package/mac80211/patches/110-disable_usb_compat.patch

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)
+ 
diff --git a/package/mac80211/patches/110-disable_usb_compat.patch b/package/mac80211/patches/110-disable_usb_compat.patch
new file mode 100644
index 0000000000..c895907ecf
--- /dev/null
+++ b/package/mac80211/patches/110-disable_usb_compat.patch
@@ -0,0 +1,33 @@
+--- a/compat/compat-2.6.28.c
++++ b/compat/compat-2.6.28.c
+@@ -166,7 +166,7 @@ EXPORT_SYMBOL(pcmcia_loop_config);
+ 
+ #endif /* CONFIG_PCMCIA */
+ 
+-#if defined(CONFIG_USB) || defined(CONFIG_USB_MODULE)
++#if 0
+ 
+ void usb_unpoison_urb(struct urb *urb)
+ {
+--- a/compat/compat-2.6.29.c
++++ b/compat/compat-2.6.29.c
+@@ -16,7 +16,7 @@
+ #include <linux/etherdevice.h>
+ 
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23))
+-#if defined(CONFIG_USB) || defined(CONFIG_USB_MODULE)
++#if 0
+ /**
+  * usb_unpoison_anchored_urbs - let an anchor be used successfully again
+  * @anchor: anchor the requests are bound to
+--- a/include/linux/compat-2.6.28.h
++++ b/include/linux/compat-2.6.28.h
+@@ -52,7 +52,7 @@ int pcmcia_loop_config(struct pcmcia_dev
+ /* USB anchors were added as of 2.6.23 */
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23))
+ 
+-#if defined(CONFIG_USB) || defined(CONFIG_USB_MODULE)
++#if 0
+ #if 0
+ extern void usb_poison_urb(struct urb *urb);
+ #endif
-- 
cgit v1.2.3