qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-28 16:05:21 +02:00
Code
13f9b2cb45
openwrt-xburst/package/mac80211/patches/100-disable_pcmcia_compat.patch

66 lines
1.6 KiB
Diff
Raw Normal View History

[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
2010-01-30 00:53:44 +02:00
--- a/compat/compat-2.6.28.c
+++ b/compat/compat-2.6.28.c
backport mac80211 and iw from trunk git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@24505 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-12-12 03:36:28 +02:00
@@ -86,7 +86,7 @@ EXPORT_SYMBOL_GPL(usb_poison_urb);
[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
2010-01-30 00:53:44 +02:00
#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
backport mac80211 and iw from trunk git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@24505 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-12-12 03:36:28 +02:00
@@ -11,7 +11,7 @@
#include <linux/compat.h>
[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
2010-01-30 00:53:44 +02:00
#include <linux/autoconf.h>
-#if defined(CONFIG_PCCARD) || defined(CONFIG_PCCARD_MODULE)
+#if 0
/**
* pccard_loop_tuple() - loop over tuples in the CIS
backport mac80211 and iw from trunk git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@24505 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-12-12 03:36:28 +02:00
@@ -73,7 +73,7 @@ next_entry:
[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
2010-01-30 00:53:44 +02:00
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
mac80211: merge latest from trunk - improves reliability with intel clients git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@24962 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-01-11 02:21:32 +02:00
@@ -7,7 +7,7 @@
[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
2010-01-30 00:53:44 +02:00
#include <linux/skbuff.h>
mac80211: merge latest from trunk - improves reliability with intel clients git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@24962 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-01-11 02:21:32 +02:00
#include <linux/pci.h>
[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
2010-01-30 00:53:44 +02:00
-#if defined(CONFIG_PCCARD) || defined(CONFIG_PCCARD_MODULE)
+#if 0
#include <pcmcia/cs_types.h>
#include <pcmcia/cistpl.h>
#include <pcmcia/ds.h>
mac80211: merge changes from latest trunk into backfire git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@22494 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-08-04 20:29:05 +03:00
@@ -65,9 +65,9 @@ static inline struct sk_buff *netdev_all
[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
2010-01-30 00:53:44 +02:00
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)
Copy Permalink