diff options
| author | varun colbert <vcolbert@nvidia.com> | 2012-06-15 12:33:09 -0700 |
|---|---|---|
| committer | varun colbert <vcolbert@nvidia.com> | 2012-06-15 12:33:09 -0700 |
| commit | fdb906a1f0b7f0eeca4c20c58cb4fefc51d62124 (patch) | |
| tree | c3f3edd4a1acb6567a27ab44c2ad16a98f06296b /arch | |
| parent | daf2ee7b9eefb84d2140152786ba8a19674b4fe6 (diff) | |
| parent | f62f3dd2c3ce8e175c89a7251096462faeb47f56 (diff) | |
Merge remote-tracking branch 'origin/dev/omp_bcmdhd_update_5_90_195_61' into promotion_build
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/tegra3_android_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/tegra3_defconfig | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/configs/tegra3_android_defconfig b/arch/arm/configs/tegra3_android_defconfig index 3c46da35f8b8..809542ded05f 100644 --- a/arch/arm/configs/tegra3_android_defconfig +++ b/arch/arm/configs/tegra3_android_defconfig @@ -230,6 +230,7 @@ CONFIG_BCM4329_HW_OOB=y CONFIG_BCM4329_OOB_INTR_ONLY=y CONFIG_BCM4329_CSCAN_ENABLE=y CONFIG_BCMDHD=m +CONFIG_DHD_ENABLE_P2P=y CONFIG_BCMDHD_CFG80211=y CONFIG_BCMDHD_WIFI_CONTROL_FUNC=y CONFIG_BCMDHD_HW_OOB=y diff --git a/arch/arm/configs/tegra3_defconfig b/arch/arm/configs/tegra3_defconfig index 2d895fef4cac..85398dee9085 100644 --- a/arch/arm/configs/tegra3_defconfig +++ b/arch/arm/configs/tegra3_defconfig @@ -180,6 +180,7 @@ CONFIG_BT_HCIUART=y CONFIG_BT_HCIUART_H4=y CONFIG_BT_HCIUART_LL=y CONFIG_BT_BLUESLEEP=y +CONFIG_CFG80211=y CONFIG_RFKILL=y CONFIG_CAIF=y CONFIG_NFC=y @@ -290,8 +291,8 @@ CONFIG_SENSORS_TEGRA_TSENSOR=y CONFIG_SENSORS_INA219=y CONFIG_THERMAL=y CONFIG_MFD_TPS6586X=y -CONFIG_MFD_MAX8907C=y CONFIG_MFD_TPS65910=y +CONFIG_MFD_MAX8907C=y CONFIG_MFD_MAX77663=y CONFIG_MFD_TPS6591X=y CONFIG_MFD_TPS80031=y |