diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2011-06-01 15:17:48 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-06-14 09:10:01 -0700 |
| commit | 6db994e17e905334b442baa38f70f2ff39ab3e8f (patch) | |
| tree | 32ada0a47c70d94aebc1bb229003564a974a931e /drivers/net/wireless/bcmdhd/dhd_common.c | |
| parent | cf77d4ca64d7cd0793f967559cbe063a21060a5b (diff) | |
net: wireless: bcmdhd: Fix config FW and NVRAM path
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'drivers/net/wireless/bcmdhd/dhd_common.c')
| -rw-r--r-- | drivers/net/wireless/bcmdhd/dhd_common.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/wireless/bcmdhd/dhd_common.c b/drivers/net/wireless/bcmdhd/dhd_common.c index b1d9e7c8760..9791250d3ec 100644 --- a/drivers/net/wireless/bcmdhd/dhd_common.c +++ b/drivers/net/wireless/bcmdhd/dhd_common.c @@ -202,16 +202,16 @@ dhd_common_init(osl_t *osh) memset(cmn, 0, sizeof(dhd_cmn_t)); cmn->osh = osh; -#ifdef CONFIG_BCM4329_FW_PATH - bcm_strncpy_s(fw_path, sizeof(fw_path), CONFIG_BCM4329_FW_PATH, MOD_PARAM_PATHLEN-1); -#else /* CONFIG_BCM4329_FW_PATH */ +#ifdef CONFIG_BCMDHD_FW_PATH + bcm_strncpy_s(fw_path, sizeof(fw_path), CONFIG_BCMDHD_FW_PATH, MOD_PARAM_PATHLEN-1); +#else fw_path[0] = '\0'; -#endif /* CONFIG_BCM4329_FW_PATH */ -#ifdef CONFIG_BCM4329_NVRAM_PATH - bcm_strncpy_s(nv_path, sizeof(nv_path), CONFIG_BCM4329_NVRAM_PATH, MOD_PARAM_PATHLEN-1); -#else /* CONFIG_BCM4329_NVRAM_PATH */ +#endif /* CONFIG_BCMDHD_FW_PATH */ +#ifdef CONFIG_BCMDHD_NVRAM_PATH + bcm_strncpy_s(nv_path, sizeof(nv_path), CONFIG_BCMDHD_NVRAM_PATH, MOD_PARAM_PATHLEN-1); +#else nv_path[0] = '\0'; -#endif /* CONFIG_BCM4329_NVRAM_PATH */ +#endif /* CONFIG_BCMDHD_NVRAM_PATH */ #ifdef SOFTAP fw_path2[0] = '\0'; #endif |