diff options
| author | Thierry Reding <treding@nvidia.com> | 2015-10-20 14:42:30 +0200 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2015-10-20 14:47:07 +0200 |
| commit | 2fb43cecf5164fd99d0fd9fdd87f40e5148ecd91 (patch) | |
| tree | e93f762fdbfe82e92c99b923619a6bb2fcf14049 /arch | |
| parent | 716d81e3508cad4f8c2fa4e48088646c0a9bbe7d (diff) | |
| download | linux-stable-2fb43cecf5164fd99d0fd9fdd87f40e5148ecd91.tar.gz linux-stable-2fb43cecf5164fd99d0fd9fdd87f40e5148ecd91.tar.bz2 linux-stable-2fb43cecf5164fd99d0fd9fdd87f40e5148ecd91.zip | |
ARM: tegra: Update multi_v7_defconfig
Enable some options that have recently been enabled on Tegra platforms:
* TOUCHSCREEN_WM97XX: touchscreen support on Toradex Colibri
* SND_SOC_TEGRA_WM9712: audio support on Toradex Colibri
Signed-off-by: Thierry Reding <treding@nvidia.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 03deb7fb35e8..333739c5161c 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -245,6 +245,7 @@ CONFIG_TOUCHSCREEN_ATMEL_MXT=y CONFIG_TOUCHSCREEN_ST1232=m CONFIG_TOUCHSCREEN_STMPE=y CONFIG_TOUCHSCREEN_SUN4I=y +CONFIG_TOUCHSCREEN_WM97XX=m CONFIG_INPUT_MISC=y CONFIG_INPUT_MPU3050=y CONFIG_INPUT_AXP20X_PEK=y @@ -485,6 +486,7 @@ CONFIG_SND_SOC_TEGRA=m CONFIG_SND_SOC_TEGRA_RT5640=m CONFIG_SND_SOC_TEGRA_WM8753=m CONFIG_SND_SOC_TEGRA_WM8903=m +CONFIG_SND_SOC_TEGRA_WM9712=m CONFIG_SND_SOC_TEGRA_TRIMSLICE=m CONFIG_SND_SOC_TEGRA_ALC5632=m CONFIG_SND_SOC_TEGRA_MAX98090=m |