From dc1007a12c4481b7b7bbbdb899b34ee2f160b244 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Fri, 29 Jan 2010 22:53:44 +0000 Subject: 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 SVN-Revision: 19389 --- .../patches/100-disable_pcmcia_compat.patch | 67 ++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 package/mac80211/patches/100-disable_pcmcia_compat.patch (limited to '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 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 + struct pcmcia_cfg_mem { +--- a/compat/compat-2.6.33.c ++++ b/compat/compat-2.6.33.c +@@ -14,7 +14,7 @@ + + #include + +-#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 + #include +--- 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 +-#if defined(CONFIG_PCCARD) || defined(CONFIG_PCCARD_MODULE) +-#if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE) ++#if 0 ++#if 0 + #include + #include + #include +@@ -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) + -- cgit v1.2.3