summaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-07-11 19:33:46 +0000
committerhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-07-11 19:33:46 +0000
commitf9840c8bfeb763d019d21f839f4215863d9d8546 (patch)
treefd786886be6dac15f20a48e646b767680b5f2d50 /package
parent0fac63b557411da51be201b7e60c78828b33866a (diff)
broadcom-wl: fix compiling with kernel 2.6.35
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22138 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/broadcom-wl/patches/003-compat-2.6.35.patch12
1 files changed, 12 insertions, 0 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 3bb786c14..564007b80 100644
--- a/package/broadcom-wl/patches/003-compat-2.6.35.patch
+++ b/package/broadcom-wl/patches/003-compat-2.6.35.patch
@@ -38,3 +38,15 @@
}
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 */