From f9840c8bfeb763d019d21f839f4215863d9d8546 Mon Sep 17 00:00:00 2001 From: hauke Date: Sun, 11 Jul 2010 19:33:46 +0000 Subject: broadcom-wl: fix compiling with kernel 2.6.35 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22138 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/broadcom-wl/patches/003-compat-2.6.35.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'package/broadcom-wl') 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 */ -- cgit v1.2.3