EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

broadcom-wl: remove pcmcia support

Browse Source 
For kernel 2.6.36 some additional pcmcia backpots would be needed, but
this should not depend on pcmcia.

SVN-Revision: 23899
This commit is contained in:
Hauke Mehrtens 2010-11-06 18:28:45 +00:00
parent 92acb04641
commit 1f8f2aaa37
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
package/broadcom-wl/patches/003-compat-2.6.35.patch
View File

@ -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 */

22
package/broadcom-wl/patches/004-remove-pcmcia.patch Normal file
View File

@ -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 */