diff options
| author | Olof Johansson <olof@lixom.net> | 2015-10-26 09:47:19 +0900 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-10-26 09:47:19 +0900 |
| commit | a83e682ee2579eaae50a6bdae46b62c7a515e696 (patch) | |
| tree | 672a187ab9ec6a8b7c2adc6652c76afcb808b637 /arch/arm/configs/multi_v7_defconfig | |
| parent | 98376f6af8f17cbc086cfc60ad6ab75f52d72a65 (diff) | |
| parent | 2fb43cecf5164fd99d0fd9fdd87f40e5148ecd91 (diff) | |
| download | blackbird-op-linux-a83e682ee2579eaae50a6bdae46b62c7a515e696.tar.gz blackbird-op-linux-a83e682ee2579eaae50a6bdae46b62c7a515e696.zip | |
Merge tag 'tegra-for-4.4-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/defconfig
ARM: tegra: Default configuration updates for v4.4-rc1
Enable touchscreen and audio support on Toradex Colibri platforms.
* tag 'tegra-for-4.4-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
ARM: tegra: Update multi_v7_defconfig
ARM: tegra: Update default configuration
ARM: tegra: Rebuild default configuration on v4.3-rc1
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs/multi_v7_defconfig')
| -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 8d00705c61d1..10dbe3a5acb3 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -249,6 +249,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 @@ -507,6 +508,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 |
