From 6db994e17e905334b442baa38f70f2ff39ab3e8f Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Wed, 1 Jun 2011 15:17:48 -0700 Subject: [PATCH 277/696] net: wireless: bcmdhd: Fix config FW and NVRAM path Signed-off-by: Dmitry Shmidt --- 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 b1d9e7c..9791250 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 -- 1.7.1