From a433f4b34ac4bf163aac0a6da7dad98e6fbde739 Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Wed, 8 May 2013 16:48:02 -0700 Subject: [PATCH] --- yaml --- r: 375017 b: refs/heads/master c: 827897c05c3da95dcd0ae44549563525a3554e00 h: refs/heads/master i: 375015: a4cafc50d84c57c49e9fa099651e0b26c4372b8a v: v3 --- [refs] | 2 +- trunk/arch/arm/configs/omap2plus_defconfig | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a56da05735a8..0a09b8dd8dcf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d240ef3056528785a28ad9b3e5013205b06e7d03 +refs/heads/master: 827897c05c3da95dcd0ae44549563525a3554e00 diff --git a/trunk/arch/arm/configs/omap2plus_defconfig b/trunk/arch/arm/configs/omap2plus_defconfig index 33903ca0d879..3838ce0f13f7 100644 --- a/trunk/arch/arm/configs/omap2plus_defconfig +++ b/trunk/arch/arm/configs/omap2plus_defconfig @@ -153,6 +153,7 @@ CONFIG_OMAP_WATCHDOG=y CONFIG_TWL4030_WATCHDOG=y CONFIG_MFD_TPS65217=y CONFIG_MFD_TPS65910=y +CONFIG_TWL6040_CORE=y CONFIG_REGULATOR_TWL4030=y CONFIG_REGULATOR_TPS65023=y CONFIG_REGULATOR_TPS6507X=y @@ -195,6 +196,7 @@ CONFIG_SND_USB_AUDIO=m CONFIG_SND_SOC=m CONFIG_SND_OMAP_SOC=m CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m +CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m CONFIG_USB=y CONFIG_USB_DEBUG=y