diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2010-07-11 19:33:46 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2010-07-11 19:33:46 +0000 |
| commit | 3f57f6f2196b71ce8bb5d97a03eb0670b97220fc (patch) | |
| tree | fd786886be6dac15f20a48e646b767680b5f2d50 /package/broadcom-wl | |
| parent | 168a565cbd7f64a66ed992d08b74622ced0e8d45 (diff) | |
| download | upstream-3f57f6f2196b71ce8bb5d97a03eb0670b97220fc.tar.gz upstream-3f57f6f2196b71ce8bb5d97a03eb0670b97220fc.tar.bz2 upstream-3f57f6f2196b71ce8bb5d97a03eb0670b97220fc.zip | |
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/broadcom-wl')
| -rw-r--r-- | package/broadcom-wl/patches/003-compat-2.6.35.patch | 12 |
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 */ |