diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 14:55:12 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 14:55:12 -0400 |
| commit | f05b3563f88b357f8ceedf0cca2b10ae9a4a9dca (patch) | |
| tree | 0d6a59c7d9654db615fe417c7920a4b6ec40f320 /arch/arm/configs | |
| parent | fca2447c7d09f1c0852e556a3884209879a6fa7c (diff) | |
| parent | 06d96e1e6dbdcc88d20b21cc54ee8388c074f47f (diff) | |
Merge branch 'for-3.5/defconfig2' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/defconfig
* 'for-3.5/defconfig2' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
ARM: tegra: update defconfig
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/tegra_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig index 7a90abb356c0..1198dd61c7c4 100644 --- a/arch/arm/configs/tegra_defconfig +++ b/arch/arm/configs/tegra_defconfig | |||
| @@ -114,6 +114,7 @@ CONFIG_REGULATOR=y | |||
| 114 | CONFIG_REGULATOR_FIXED_VOLTAGE=y | 114 | CONFIG_REGULATOR_FIXED_VOLTAGE=y |
| 115 | CONFIG_REGULATOR_VIRTUAL_CONSUMER=y | 115 | CONFIG_REGULATOR_VIRTUAL_CONSUMER=y |
| 116 | CONFIG_REGULATOR_GPIO=y | 116 | CONFIG_REGULATOR_GPIO=y |
| 117 | CONFIG_REGULATOR_TPS62360=y | ||
| 117 | CONFIG_REGULATOR_TPS6586X=y | 118 | CONFIG_REGULATOR_TPS6586X=y |
| 118 | CONFIG_SOUND=y | 119 | CONFIG_SOUND=y |
| 119 | CONFIG_SND=y | 120 | CONFIG_SND=y |
| @@ -149,6 +150,7 @@ CONFIG_KEYBOARD_NVEC=y | |||
| 149 | CONFIG_SERIO_NVEC_PS2=y | 150 | CONFIG_SERIO_NVEC_PS2=y |
| 150 | CONFIG_TEGRA_IOMMU_GART=y | 151 | CONFIG_TEGRA_IOMMU_GART=y |
| 151 | CONFIG_TEGRA_IOMMU_SMMU=y | 152 | CONFIG_TEGRA_IOMMU_SMMU=y |
| 153 | CONFIG_MEMORY=y | ||
| 152 | CONFIG_IIO=y | 154 | CONFIG_IIO=y |
| 153 | CONFIG_EXT2_FS=y | 155 | CONFIG_EXT2_FS=y |
| 154 | CONFIG_EXT2_FS_XATTR=y | 156 | CONFIG_EXT2_FS_XATTR=y |