diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2012-01-24 13:37:34 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2012-01-27 15:32:32 -0800 |
| commit | 1dddb0cc0de2840a2fe43a02fcb0196bb5cb86c8 (patch) | |
| tree | 5cbb6cdf46c0a1d973c11b582571548b868993d1 /drivers/net/wireless/bcmdhd/bcmutils.c | |
| parent | 52bdb6f54335bce7861d756ce1eb03ea9b7adb8f (diff) | |
| download | kernel_samsung_aries-1dddb0cc0de2840a2fe43a02fcb0196bb5cb86c8.zip kernel_samsung_aries-1dddb0cc0de2840a2fe43a02fcb0196bb5cb86c8.tar.gz kernel_samsung_aries-1dddb0cc0de2840a2fe43a02fcb0196bb5cb86c8.tar.bz2 | |
net: wireless: bcmdhd: Update to Version 5.90.195.15
- Add WFD concurrent mode support
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'drivers/net/wireless/bcmdhd/bcmutils.c')
| -rw-r--r-- | drivers/net/wireless/bcmdhd/bcmutils.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/bcmdhd/bcmutils.c b/drivers/net/wireless/bcmdhd/bcmutils.c index fbdd7cd..6b578e6 100644 --- a/drivers/net/wireless/bcmdhd/bcmutils.c +++ b/drivers/net/wireless/bcmdhd/bcmutils.c @@ -20,7 +20,7 @@ * Notwithstanding the above, under no circumstances may you combine this * software in any way with any other Broadcom software provided under a license * other than the GPL, without Broadcom's express prior written consent. - * $Id: bcmutils.c,v 1.277.2.18 2011-01-26 02:32:08 Exp $ + * $Id: bcmutils.c,v 1.277.2.18 2011-01-26 02:32:08 $ */ #include <typedefs.h> @@ -987,7 +987,6 @@ pktsetprio(void *pkt, bool update_vtag) return (rc | priority); } -#ifndef BCM_BOOTLOADER static char bcm_undeferrstr[32]; static const char *bcmerrorstrtable[] = BCMERRSTRINGTABLE; @@ -1009,7 +1008,6 @@ bcmerrorstr(int bcmerror) return bcmerrorstrtable[-bcmerror]; } -#endif /* !BCM_BOOTLOADER */ |