diff options
| author | Mursalin Akon <makon@nvidia.com> | 2011-09-20 11:12:35 -0700 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2011-09-26 19:34:11 -0700 |
| commit | d5f14488c48a528c04cbf52cc9057e6b546443a7 (patch) | |
| tree | c680b00ff4ad5cff5c3b122287df97f78f3ac4e1 /arch | |
| parent | fb6b4edde1e7c6374e8ad982eef11219a41af4d7 (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>
Diffstat (limited to 'arch')
| -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 5fd09eb8f38b..1b3a40c47d56 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 |