diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2010-11-06 18:28:45 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2010-11-06 18:28:45 +0000 |
| commit | 1f8f2aaa37114460df167dda37260190e714e6fc (patch) | |
| tree | ce92eee38fb9321d4d5991fb27838afc1fafa805 | |
| parent | 92acb04641bde4b8dcd13732a6ac5d30220a313e (diff) | |
| download | upstream-1f8f2aaa37114460df167dda37260190e714e6fc.tar.gz upstream-1f8f2aaa37114460df167dda37260190e714e6fc.tar.bz2 upstream-1f8f2aaa37114460df167dda37260190e714e6fc.zip | |
broadcom-wl: remove pcmcia support
For kernel 2.6.36 some additional pcmcia backpots would be needed, but
this should not depend on pcmcia.
SVN-Revision: 23899
| -rw-r--r-- | package/broadcom-wl/patches/003-compat-2.6.35.patch | 12 | ||||
| -rw-r--r-- | package/broadcom-wl/patches/004-remove-pcmcia.patch | 22 |
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 564007b800..3bb786c140 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 0000000000..36dda47e10 --- /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 */ |