Re: [build failure] Re: [GIT PULL] sound updates for 2.6.39-rc1

[Takashi Iwai]

At Tue, 22 Mar 2011 08:38:39 -0700,
Randy Dunlap wrote:
> 
> On Tue, 22 Mar 2011 12:24:36 +0000 Mark Brown wrote:
> 
> > On Mon, Mar 21, 2011 at 04:58:27PM +0000, Mark Brown wrote:
> > > That's the breakage, yes.  It should be very straightforward to make the
> > > driver build no matter how CONFIG_REGULATOR is set.
> > 
> > And indeed it was - in the absence of any response from Zeng I've now
> > sent a patch for review.
> > --
> 
> Hi,
> Where was the patch sent, please?

alsa-devel ML.  Attached below.


Takashi

===
From: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Subject: [alsa-devel] [PATCH] ASoC: Support !REGULATOR build for sgtl5000

The regulator is optional depending on board design.

Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
---
 sound/soc/codecs/sgtl5000.c |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c
index 1f7217f..ff29380 100644
--- a/sound/soc/codecs/sgtl5000.c
+++ b/sound/soc/codecs/sgtl5000.c
@@ -772,6 +772,7 @@ static int sgtl5000_pcm_hw_params(struct snd_pcm_substream *substream,
 	return 0;
 }
 
+#ifdef CONFIG_REGULATOR
 static int ldo_regulator_is_enabled(struct regulator_dev *dev)
 {
 	struct ldo_regulator *ldo = rdev_get_drvdata(dev);
@@ -901,6 +902,19 @@ static int ldo_regulator_remove(struct snd_soc_codec *codec)
 
 	return 0;
 }
+#else
+static int ldo_regulator_register(struct snd_soc_codec *codec,
+				struct regulator_init_data *init_data,
+				int voltage)
+{
+	return -EINVAL;
+}
+
+static int ldo_regulator_remove(struct snd_soc_codec *codec)
+{
+	return 0;
+}
+#endif
 
 /*
  * set dac bias
-- 
1.7.4.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/