summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-11-06 18:28:45 +0000
committerhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-11-06 18:28:45 +0000
commitbedf12ad6b643cc661748ccbd2d1e48ed415a04c (patch)
tree57dd275ecc28ab2fe722cb7bb14b7896b5b670a1
parente3cd71ceb28f0c27f933a9d64eefa8f0a6c68cf7 (diff)
broadcom-wl: remove pcmcia support
For kernel 2.6.36 some additional pcmcia backpots would be needed, but this should not depend on pcmcia. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23899 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/broadcom-wl/patches/003-compat-2.6.35.patch12
-rw-r--r--package/broadcom-wl/patches/004-remove-pcmcia.patch22
2 files changed, 22 insertions, 12 deletions
diff --git a/package/broadcom-wl/patches/003-compat-2.6.35.patch b/package/broadcom-wl/patches/003-compat-2.6.35.patch
index 564007b80..3bb786c14 100644
--- a/package/broadcom-wl/patches/003-compat-2.6.35.patch
+++ b/package/broadcom-wl/patches/003-compat-2.6.35.patch
@@ -38,15 +38,3 @@
}
wl->pub->nmulticast = i;
wlc_set(wl->wlc, WLC_SET_PROMISC, (dev->flags & IFF_PROMISC));
---- a/driver/linux_osl.c
-+++ b/driver/linux_osl.c
-@@ -65,7 +65,9 @@ struct osl_info {
- #if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE)
- struct pcmcia_dev {
- dev_link_t link; /* PCMCIA device pointer */
-+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,34)
- dev_node_t node; /* PCMCIA node structure */
-+#endif
- void *base; /* Mapped attribute memory window */
- size_t size; /* Size of window */
- void *drv; /* Driver data */
diff --git a/package/broadcom-wl/patches/004-remove-pcmcia.patch b/package/broadcom-wl/patches/004-remove-pcmcia.patch
new file mode 100644
index 000000000..36dda47e1
--- /dev/null
+++ b/package/broadcom-wl/patches/004-remove-pcmcia.patch
@@ -0,0 +1,22 @@
+--- a/driver/include/linuxver.h
++++ b/driver/include/linuxver.h
+@@ -111,7 +111,7 @@ typedef irqreturn_t(*FN_ISR) (int irq, v
+ #endif /* not SANDGATE2G */
+ #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 67) */
+
+-#if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE)
++#if 0
+
+ #include <pcmcia/cs_types.h>
+ #include <pcmcia/cs.h>
+--- a/driver/linux_osl.c
++++ b/driver/linux_osl.c
+@@ -62,7 +62,7 @@ struct osl_info {
+ };
+
+ /* PCMCIA attribute space access macros */
+-#if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE)
++#if 0
+ struct pcmcia_dev {
+ dev_link_t link; /* PCMCIA device pointer */
+ dev_node_t node; /* PCMCIA node structure */