From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sun, 11 Jul 2010 19:33:46 +0000 (+0000)
Subject: broadcom-wl: fix compiling with kernel 2.6.35
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9aa7a94047d2e38cddb741d86c4f8ed569088575;p=openwrt%2Fstaging%2Frobimarko.git

broadcom-wl: fix compiling with kernel 2.6.35

SVN-Revision: 22138
---

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