Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f05b3563 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'for-3.5/defconfig2' of... 

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
parents fca2447c 06d96e1e

arch/arm/configs/tegra_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ CONFIG_REGULATOR=y 
CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_VIRTUAL_CONSUMER=y

CONFIG_REGULATOR_GPIO=y

CONFIG_REGULATOR_TPS62360=y

CONFIG_REGULATOR_TPS6586X=y

CONFIG_SOUND=y

CONFIG_SND=y
@@ -149,6 +150,7 @@ CONFIG_KEYBOARD_NVEC=y 
CONFIG_SERIO_NVEC_PS2=y

CONFIG_TEGRA_IOMMU_GART=y

CONFIG_TEGRA_IOMMU_SMMU=y

CONFIG_MEMORY=y

CONFIG_IIO=y

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y