summaryrefslogtreecommitdiff
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorNagarjuna Kristam <nkristam@nvidia.com>2014-04-21 10:57:46 +0530
committerSimone Willett <swillett@nvidia.com>2014-04-25 13:10:13 -0700
commit306d2eb0dd4c56d386225bb77b6a92b490d78d04 (patch)
treecfb6b019b50b9637390a49449ef0473728edaeda /arch/arm/configs
parent9cfecf5764ff8e93256222052be7212fe3563644 (diff)
arm: tegra: config: cleanup t124 and t132 defconfig
While updating defconfig using ksetup and ksaveconfig, non-comms changes are seen. Clean up defconigs using ksetup and immediate ksavedefconfig. Bug 1430977 Change-Id: I2a360623490565f0e1b77e38efc94678a5305217 Signed-off-by: Nagarjuna Kristam <nkristam@nvidia.com> Reviewed-on: http://git-master/r/398715 Reviewed-by: Simone Willett <swillett@nvidia.com> Tested-by: Simone Willett <swillett@nvidia.com>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/tegra12_android_defconfig9
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/arm/configs/tegra12_android_defconfig b/arch/arm/configs/tegra12_android_defconfig
index 5c9f0d6131fa..cfcf707ba605 100644
--- a/arch/arm/configs/tegra12_android_defconfig
+++ b/arch/arm/configs/tegra12_android_defconfig
@@ -41,7 +41,6 @@ CONFIG_TEGRA_WAKEUP_MONITOR=y
CONFIG_TEGRA_PREPOWER_WIFI=y
CONFIG_TEGRA_SKIN_THROTTLE=y
CONFIG_TEGRA_PLLM_SCALED=y
-CONFIG_TEGRA_MC_DOMAINS=y
CONFIG_TEGRA_USE_NCT=y
CONFIG_ARM_LPAE=y
# CONFIG_CACHE_L2X0 is not set
@@ -243,11 +242,8 @@ CONFIG_USB_NET_RAW_IP=m
CONFIG_WIFI_CONTROL_FUNC=y
CONFIG_BCMDHD=m
CONFIG_BCM43241=y
-CONFIG_BCM43341=y
CONFIG_BCMDHD_FW_PATH="/data/misc/wifi/firmware/fw_bcmdhd.bin"
CONFIG_BCMDHD_NVRAM_PATH="/data/misc/wifi/firmware/nvram.txt"
-CONFIG_BCMDHD_HW_OOB=y
-CONFIG_BCMDHD_INSMOD_NO_FW_LOAD=y
CONFIG_SD8897=m
# CONFIG_INPUT_MOUSEDEV is not set
CONFIG_INPUT_JOYDEV=y
@@ -388,8 +384,6 @@ CONFIG_TEGRA_DP=y
CONFIG_TEGRA_NVSR=y
CONFIG_TEGRA_NVHDCP=y
# CONFIG_TEGRA_CAMERA is not set
-CONFIG_GK20A_PMU=y
-CONFIG_GK20A_DEVFREQ=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=y
# CONFIG_BACKLIGHT_GENERIC is not set
@@ -549,6 +543,7 @@ CONFIG_ION=y
CONFIG_ION_DUMMY=y
CONFIG_USB_WPAN_HCD=y
CONFIG_PASR=y
+CONFIG_TEGRA_MC_DOMAINS=y
CONFIG_CLK_PALMAS=y
CONFIG_CLK_AS3722=y
CONFIG_TEGRA_IOMMU_SMMU=y
@@ -558,6 +553,8 @@ CONFIG_EXTCON_PALMAS=y
CONFIG_IIO=y
CONFIG_PWM=y
CONFIG_PWM_TEGRA=y
+CONFIG_GK20A_PMU=y
+CONFIG_GK20A_DEVFREQ=y
CONFIG_EXT2_FS=y
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y