diff options
| author | Mursalin Akon <makon@nvidia.com> | 2012-01-27 15:33:34 -0800 |
|---|---|---|
| committer | Rohan Somvanshi <rsomvanshi@nvidia.com> | 2012-02-13 06:46:19 -0800 |
| commit | e1373e441ab235da02fe48c2b9fe99adfb494428 (patch) | |
| tree | a78a2d057891eb4cb4fc6337eb703d5637ed4182 /arch/arm/configs | |
| parent | faf2c6cfa976484b85d7e2b510573b23835dc06e (diff) | |
tegra: defconfig: cleanup BCM4329 configs
This CL includes following changes
- BCM4329 CSCAN functionality has been moved to a
new Kconfig option; we will preserve the expected
behavior (option enabled) for existing users
- remove dangling reference to BCM4329 Kconfig
option
Change-Id: I5876c33ef6f25309bcb0bedb3b1808d6bfb87b65
Signed-off-by: Mursalin Akon <makon@nvidia.com>
Reviewed-on: http://git-master/r/82862
Reviewed-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Tested-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/tegra3_android_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/tegra_android_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/tegra_p852_gnu_linux_defconfig | 1 |
3 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/configs/tegra3_android_defconfig b/arch/arm/configs/tegra3_android_defconfig index 6d95961c9cc5..d00d84e68946 100644 --- a/arch/arm/configs/tegra3_android_defconfig +++ b/arch/arm/configs/tegra3_android_defconfig @@ -218,6 +218,7 @@ CONFIG_BCM4329_FIRST_SCAN=y CONFIG_BCM4329_FW_PATH="/system/vendor/firmware/fw_bcm4329.bin" CONFIG_BCM4329_NVRAM_PATH="/system/etc/nvram.txt" CONFIG_BCM4329_WIFI_CONTROL_FUNC=y +CONFIG_BCM4329_CSCAN_ENABLE=y CONFIG_BCMDHD=m CONFIG_BCMDHD_WIFI_CONTROL_FUNC=y CONFIG_BCMDHD_HW_OOB=y diff --git a/arch/arm/configs/tegra_android_defconfig b/arch/arm/configs/tegra_android_defconfig index 4395fa6948c8..3b5b070af69b 100644 --- a/arch/arm/configs/tegra_android_defconfig +++ b/arch/arm/configs/tegra_android_defconfig @@ -206,6 +206,7 @@ CONFIG_BCM4329_FIRST_SCAN=y CONFIG_BCM4329_FW_PATH="/system/vendor/firmware/fw_bcm4329.bin" CONFIG_BCM4329_NVRAM_PATH="/system/etc/nvram.txt" CONFIG_BCM4329_WIFI_CONTROL_FUNC=y +CONFIG_BCM4329_CSCAN_ENABLE=y CONFIG_BCMDHD=y CONFIG_BCMDHD_WIFI_CONTROL_FUNC=y CONFIG_BCMDHD_HW_OOB=y diff --git a/arch/arm/configs/tegra_p852_gnu_linux_defconfig b/arch/arm/configs/tegra_p852_gnu_linux_defconfig index e393d437365f..a47171171e3b 100644 --- a/arch/arm/configs/tegra_p852_gnu_linux_defconfig +++ b/arch/arm/configs/tegra_p852_gnu_linux_defconfig @@ -164,7 +164,6 @@ CONFIG_NET_ETHERNET=y CONFIG_SMC91X=y # CONFIG_NETDEV_1000 is not set # CONFIG_NETDEV_10000 is not set -CONFIG_BCM4329_WIFI_CONTROL_FUNC=y CONFIG_USB_USBNET=y CONFIG_USB_NET_SMSC95XX=y # CONFIG_USB_NET_NET1080 is not set |