aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2010-07-11 19:33:46 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2010-07-11 19:33:46 +0000
commit9aa7a94047d2e38cddb741d86c4f8ed569088575 (patch)
tree6e8646bbad173f34cb0923190ce193856d41724d
parent02a147de0c298c612049409fd4d64b12dc3d9ba1 (diff)
downloadupstream-9aa7a94047d2e38cddb741d86c4f8ed569088575.tar.gz
upstream-9aa7a94047d2e38cddb741d86c4f8ed569088575.tar.bz2
upstream-9aa7a94047d2e38cddb741d86c4f8ed569088575.zip
broadcom-wl: fix compiling with kernel 2.6.35
SVN-Revision: 22138
-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 3bb786c140..564007b800 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 */