diff options
| author | Narayan Reddy <narayanr@nvidia.com> | 2011-10-25 16:39:59 +0530 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:52:35 -0800 |
| commit | f8a0d126be464a21bb55cafed5285bd4cd9a511e (patch) | |
| tree | beaf6b4eb98142c8709b4d5467ca0fa429312792 /drivers/net/wireless/bcmdhd/dhd.h | |
| parent | 84d261b7df0abd9ff03c4a111008d6f51cc1c4ce (diff) | |
drivers: net: bcmdhd: load firmare based on chipid
bcm4329 and bcm4330 need different firmware files. This change
detects chipid and loads firmware located at
CONFIG_BCMDHD_FW_DIR/firmware_bcm<chipid>.bin
Bug 820860
(cherry picked from commit 850c98cc99c0bd8feee523a6c62501de9be3c770)
Change-Id: I043ffeda3ae8fe6f5c0c133bacc4aba7a080b983
Reviewed-on: http://git-master/r/60221
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>
Rebase-Id: R59196ff5cb76aedcfaae1e84277a2ae27ce92314
Diffstat (limited to 'drivers/net/wireless/bcmdhd/dhd.h')
| -rw-r--r-- | drivers/net/wireless/bcmdhd/dhd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/bcmdhd/dhd.h b/drivers/net/wireless/bcmdhd/dhd.h index c87f6cf37d9c..18d48d846d08 100644 --- a/drivers/net/wireless/bcmdhd/dhd.h +++ b/drivers/net/wireless/bcmdhd/dhd.h @@ -462,7 +462,7 @@ extern int dhd_wl_ioctl(dhd_pub_t *dhd_pub, int ifindex, wl_ioctl_t *ioc, void * extern int dhd_wl_ioctl_cmd(dhd_pub_t *dhd_pub, int cmd, void *arg, int len, uint8 set, int ifindex); -extern struct dhd_cmn *dhd_common_init(osl_t *osh); +extern struct dhd_cmn *dhd_common_init(uint16 devid, osl_t *osh); extern void dhd_common_deinit(dhd_pub_t *dhd_pub, dhd_cmn_t *sa_cmn); extern int dhd_add_if(struct dhd_info *dhd, int ifidx, void *handle, |