diff options
| author | Gaurav Sarode <gsarode@nvidia.com> | 2012-02-20 17:11:02 +0530 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-02-21 10:46:34 -0800 |
| commit | b48087f0b7616114f4c9f0236a96d3f0a0d7181c (patch) | |
| tree | 570d08e82262fd4da09d96d536478cd69fa6a83f /arch/arm/configs | |
| parent | 15e65f291f12c084c18956263ee61f005caf8a9e (diff) | |
arm: tegra: config: Update Tegra defconfig
Change-Id: I93e6380f3c9f838ecbe29de5ad9d14bab442d7d3
Signed-off-by: Gaurav Sarode <gsarode@nvidia.com>
Reviewed-on: http://git-master/r/84797
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/tegra3_android_defconfig | 8 | ||||
| -rw-r--r-- | arch/arm/configs/tegra_android_defconfig | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/arch/arm/configs/tegra3_android_defconfig b/arch/arm/configs/tegra3_android_defconfig index 8089b2228540..0dd85c453b0d 100644 --- a/arch/arm/configs/tegra3_android_defconfig +++ b/arch/arm/configs/tegra3_android_defconfig @@ -182,7 +182,6 @@ CONFIG_BLK_DEV_LOOP=y CONFIG_MISC_DEVICES=y CONFIG_AD525X_DPOT=y CONFIG_AD525X_DPOT_I2C=y -# CONFIG_ANDROID_PMEM is not set CONFIG_APDS9802ALS=y CONFIG_SENSORS_NCT1008=y CONFIG_UID_STAT=y @@ -259,6 +258,7 @@ CONFIG_TOUCHSCREEN_SYN_RMI4_SPI=y CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=y CONFIG_INPUT_GPIO=y +CONFIG_INPUT_CAPELLA_CM3217=y CONFIG_SERIO_LIBPS2=y # CONFIG_VT is not set # CONFIG_LEGACY_PTYS is not set @@ -281,16 +281,16 @@ CONFIG_GPIO_SYSFS=y CONFIG_POWER_SUPPLY=y CONFIG_BATTERY_BQ20Z75=y CONFIG_BATTERY_BQ27x00=y -CONFIG_CHARGER_SMB349=y CONFIG_CHARGER_TPS8003X=y CONFIG_BATTERY_GAUGE_TPS8003X=y +CONFIG_CHARGER_SMB349=y CONFIG_BATTERY_MAX17048=y CONFIG_CHARGER_GPIO=y CONFIG_SENSORS_TEGRA_TSENSOR=y CONFIG_SENSORS_INA219=y CONFIG_THERMAL=y -CONFIG_MFD_MAX77663=y CONFIG_MFD_TPS6586X=y +CONFIG_MFD_MAX77663=y CONFIG_MFD_TPS6591X=y CONFIG_MFD_TPS80031=y CONFIG_GPADC_TPS80031=y @@ -392,7 +392,6 @@ CONFIG_ANDROID_TIMED_GPIO=y CONFIG_ANDROID_LOW_MEMORY_KILLER=y CONFIG_IIO=y CONFIG_SENSORS_ISL29028=y -CONFIG_INPUT_CAPELLA_CM3217=y CONFIG_EXT2_FS=y CONFIG_EXT2_FS_XATTR=y CONFIG_EXT2_FS_POSIX_ACL=y @@ -422,7 +421,6 @@ CONFIG_TIMER_STATS=y # CONFIG_DEBUG_PREEMPT is not set CONFIG_DEBUG_INFO=y CONFIG_DEBUG_VM=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set CONFIG_DYNAMIC_DEBUG=y CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_SHA256=y diff --git a/arch/arm/configs/tegra_android_defconfig b/arch/arm/configs/tegra_android_defconfig index 3b5b070af69b..2b4367a4994a 100644 --- a/arch/arm/configs/tegra_android_defconfig +++ b/arch/arm/configs/tegra_android_defconfig @@ -173,7 +173,6 @@ CONFIG_BLK_DEV_LOOP=y CONFIG_MISC_DEVICES=y CONFIG_AD525X_DPOT=y CONFIG_AD525X_DPOT_I2C=y -# CONFIG_ANDROID_PMEM is not set CONFIG_APDS9802ALS=y CONFIG_SENSORS_NCT1008=y CONFIG_UID_STAT=y @@ -374,7 +373,6 @@ CONFIG_DEBUG_MUTEXES=y CONFIG_DEBUG_INFO=y CONFIG_DEBUG_VM=y CONFIG_DEBUG_SG=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_TWOFISH=y # CONFIG_CRYPTO_ANSI_CPRNG is not set |