From: Peter Ujfalusi <peter.ujfalusi@ti•com>
To: Samuel Ortiz <sameo@linux•intel.com>
Cc: Tony Lindgren <tony@atomide•com>, Liam Girdwood <lrg@ti•com>,
Stephen Rothwell <sfr@canb•auug.org.au>,
linux-kernel@vger•kernel.org,
linux-arm-kernel@lists•infradead.org, linux-omap@vger•kernel.org,
linux-next@vger•kernel.org, paul.gortmaker@windriver•com
Subject: [PATCH 3/5] Revert "ASoC: Remove twl6040 dependency on twl4030 from Kconfig"
Date: Tue, 6 Mar 2012 14:35:14 +0200 [thread overview]
Message-ID: <1331037316-7375-4-git-send-email-peter.ujfalusi@ti.com> (raw)
In-Reply-To: <1331037316-7375-1-git-send-email-peter.ujfalusi@ti.com>
This reverts commit 36229729d92f903a7311f1c040b33d5bab0af60b.
Reverting changes regarding to twl6040 in MFD tree since the patches will go
via the audio tree.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti•com>
---
sound/soc/codecs/Kconfig | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index f1a1197..7c205e7 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -56,7 +56,7 @@ config SND_SOC_ALL_CODECS
select SND_SOC_TPA6130A2 if I2C
select SND_SOC_TLV320DAC33 if I2C
select SND_SOC_TWL4030 if TWL4030_CORE
- select SND_SOC_TWL6040 if I2C
+ select SND_SOC_TWL6040 if TWL4030_CORE
select SND_SOC_UDA134X
select SND_SOC_UDA1380 if I2C
select SND_SOC_WL1273 if MFD_WL1273_CORE
--
1.7.8.5
next prev parent reply other threads:[~2012-03-06 12:35 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-06 12:35 [PATCH 0/5] MFD: Reverting twl6040 patches going for 3.4 Peter Ujfalusi
2012-03-06 12:35 ` [PATCH 1/5] Revert "mfd/Input/ASoC: twl6040 kconfig fixes" Peter Ujfalusi
2012-03-06 12:35 ` [PATCH 2/5] Revert "mfd: Add regulator support for twl6040 VIO, V2V1 supplies" Peter Ujfalusi
2012-03-06 12:35 ` Peter Ujfalusi [this message]
2012-03-06 12:35 ` [PATCH 4/5] Revert "mfd: Convert twl6040 to an i2c driver, and separate it from twl core" Peter Ujfalusi
2012-03-06 12:35 ` [PATCH 5/5] Revert "mfd: Detach twl6040 from the pmic mfd driver" Peter Ujfalusi
2012-03-06 17:42 ` [PATCH 0/5] MFD: Reverting twl6040 patches going for 3.4 Samuel Ortiz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1331037316-7375-4-git-send-email-peter.ujfalusi@ti.com \
--to=peter.ujfalusi@ti$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux-omap@vger$(echo .)kernel.org \
--cc=lrg@ti$(echo .)com \
--cc=paul.gortmaker@windriver$(echo .)com \
--cc=sameo@linux$(echo .)intel.com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tony@atomide$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox