summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorOm Prakash Singh <omp@nvidia.com>2011-12-21 13:59:27 +0530
committerRohan Somvanshi <rsomvanshi@nvidia.com>2012-02-03 05:21:18 -0800
commitb2e4cc8269bcd746afc69c9342b1bb0a8ade81bb (patch)
tree3400c52b8a70e11bacc46867cc9e8bfd73e808ea /arch
parent0d932c60e6cc9cd1b26b94f0d882fe1716c7dc28 (diff)
arch: tegra3: config: enable TI wl12xx wifi and bluetooth
Bug 926128 Reviewed-on: http://git-master/r/75252 Change-Id: I7f9928ab1efdb82ab73eea595c2a8590057b8c72 Signed-off-by: Om Prakash Singh <omp@nvidia.com> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Reviewed-on: http://git-master/r/78436 Reviewed-by: Automatic_Commit_Validation_User
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/tegra3_android_defconfig7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/configs/tegra3_android_defconfig b/arch/arm/configs/tegra3_android_defconfig
index 9c0280f037fa..91728a71a022 100644
--- a/arch/arm/configs/tegra3_android_defconfig
+++ b/arch/arm/configs/tegra3_android_defconfig
@@ -169,7 +169,10 @@ CONFIG_BT_HCIUART=y
CONFIG_BT_HCIUART_H4=y
CONFIG_BT_HCIUART_LL=y
CONFIG_BT_BLUESLEEP=y
+CONFIG_BT_WILINK=m
CONFIG_CFG80211=m
+CONFIG_LIB80211=m
+CONFIG_MAC80211=m
CONFIG_RFKILL=y
CONFIG_CAIF=y
# CONFIG_FIRMWARE_IN_KERNEL is not set
@@ -184,6 +187,7 @@ CONFIG_UID_STAT=y
CONFIG_BCM4329_RFKILL=y
CONFIG_TEGRA_CRYPTO_DEV=y
CONFIG_MAX1749_VIBRATOR=y
+CONFIG_TI_ST=y
CONFIG_MPU_SENSORS_TIMERIRQ=y
CONFIG_MPU_SENSORS_KXTF9=y
CONFIG_MPU_SENSORS_AK8975=y
@@ -211,6 +215,9 @@ CONFIG_BCM4329_WIFI_CONTROL_FUNC=y
CONFIG_BCMDHD=m
CONFIG_BCMDHD_WIFI_CONTROL_FUNC=y
CONFIG_BCMDHD_HW_OOB=y
+CONFIG_WL12XX_MENU=m
+CONFIG_WL12XX=m
+CONFIG_WL12XX_SDIO=m
CONFIG_USB_USBNET=y
CONFIG_USB_NET_SMSC95XX=y
# CONFIG_USB_NET_NET1080 is not set