diff options
author | Mursalin Akon <makon@nvidia.com> | 2011-09-20 11:12:35 -0700 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:48:59 -0800 |
commit | 5511320bcaf86b5a3249f40e5a3280fe7d1225e7 (patch) | |
tree | da486705544660a849084acd211c42877b17bca3 /arch/arm/configs/tegra3_defconfig | |
parent | 5d97af24ac1b58d73b1468f08602f8bfc9344850 (diff) |
ARM: config: tegra3: enable Broadcom 4329
Cardhu has this H/W module.
Change-Id: I07e3e4e446ec5fc6ec29d968db266897b53a318e
Signed-off-by: Mursalin Akon <makon@nvidia.com>
Reviewed-on: http://git-master/r/53530
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>
Rebase-Id: R9ea7cb6fd1839b2556df773a9b54cdc13df34baf
Diffstat (limited to 'arch/arm/configs/tegra3_defconfig')
-rw-r--r-- | arch/arm/configs/tegra3_defconfig | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/configs/tegra3_defconfig b/arch/arm/configs/tegra3_defconfig index dc61dbfd2dca..8322e7e847dc 100644 --- a/arch/arm/configs/tegra3_defconfig +++ b/arch/arm/configs/tegra3_defconfig @@ -65,7 +65,6 @@ CONFIG_INET6_IPCOMP=y CONFIG_IPV6_MIP6=y CONFIG_IPV6_TUNNEL=y CONFIG_IPV6_MULTIPLE_TABLES=y -# CONFIG_WIRELESS is not set # CONFIG_FIRMWARE_IN_KERNEL is not set CONFIG_BLK_DEV_LOOP=y CONFIG_MISC_DEVICES=y @@ -79,7 +78,10 @@ CONFIG_NETDEVICES=y CONFIG_DUMMY=y CONFIG_MII=y # CONFIG_NETDEV_10000 is not set -# CONFIG_WLAN is not set +CONFIG_BCM4329=m +CONFIG_BCM4329_FW_PATH="/lib/firmware/bcm4329/fw_bcm4329.bin" +CONFIG_BCM4329_NVRAM_PATH="/lib/firmware/bcm4329/nvram.txt" +CONFIG_BCM4329_WIFI_CONTROL_FUNC=y CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_ATMEL_MXT=y CONFIG_INPUT_MISC=y |