summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMursalin Akon <makon@nvidia.com>2012-04-04 11:20:56 -0700
committerRohan Somvanshi <rsomvanshi@nvidia.com>2012-04-06 05:04:52 -0700
commit27047715b617087b93e2b7f8d12a51e5a48eb53c (patch)
tree28290c110466210cc8b2d817cd70405cb46985cc /arch
parent19cef88ead36b65744a3c81734a3c54e55245b1e (diff)
config: rename+move bcm4329 nvram file
bcm43330 nvram file is located as /lib/firmware/nvram_4330.txt. Make the name convension and location the same for bcm4329 nvram file. Bug 953186 Change-Id: Id1a606b341302dbef98f9edb481c18a8f3b3617d Signed-off-by: Mursalin Akon <makon@nvidia.com> Reviewed-on: http://git-master/r/94571 Reviewed-by: Rohan Somvanshi <rsomvanshi@nvidia.com> Tested-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/tegra3_defconfig2
-rw-r--r--arch/arm/configs/tegra_defconfig2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/configs/tegra3_defconfig b/arch/arm/configs/tegra3_defconfig
index da27dfa29ab1..f8733190bef4 100644
--- a/arch/arm/configs/tegra3_defconfig
+++ b/arch/arm/configs/tegra3_defconfig
@@ -221,7 +221,7 @@ CONFIG_R8169=y
CONFIG_BCM4329=m
CONFIG_BCM4329_FIRST_SCAN=y
CONFIG_BCM4329_FW_PATH="/lib/firmware/bcm4329/fw_bcm4329.bin"
-CONFIG_BCM4329_NVRAM_PATH="/lib/firmware/bcm4329/nvram.txt"
+CONFIG_BCM4329_NVRAM_PATH="/lib/firmware/nvram_4329.txt"
CONFIG_BCM4329_WIFI_CONTROL_FUNC=y
CONFIG_BCMDHD=m
CONFIG_BCMDHD_FW_DIR="/lib/firmware"
diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig
index a8281c87767d..7f6d817e45f3 100644
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@ -215,7 +215,7 @@ CONFIG_R8169=y
CONFIG_BCM4329=m
CONFIG_BCM4329_FIRST_SCAN=y
CONFIG_BCM4329_FW_PATH="/lib/firmware/bcm4329/fw_bcm4329.bin"
-CONFIG_BCM4329_NVRAM_PATH="/lib/firmware/bcm4329/nvram.txt"
+CONFIG_BCM4329_NVRAM_PATH="/lib/firmware/nvram_4329.txt"
CONFIG_BCM4329_WIFI_CONTROL_FUNC=y
CONFIG_USB_CATC=y
CONFIG_USB_KAWETH=y