[alsa-devel] ASoC updates for 2.6.40

[Takashi Iwai]

At Tue, 3 May 2011 11:27:34 +0100,
Mark Brown wrote:
> 
> The following changes since commit 773b1d3d31bbf7257c48f6257b4ab06bcf4f5dfa:
> 
>   ASoC: Tegra: Support more boards (2011-04-18 21:34:16 +0100)
> 
> are available in the git repository at:
>   git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.40

Pulled now.

Also I applied the following patch on the top for fixing compile
warnings.


thanks,

Takashi

---
From: Takashi Iwai <tiwai at suse.de>
Subject: [PATCH] ASoC: Declare const properly for enum texts

The enum texts are supposed to be const char * const [].  Without the
second const, it gets compile warnings like
    sound/soc/codecs/max98095.c:607:2: warning: initialization discards qualifiers from pointer target type

Signed-off-by: Takashi Iwai <tiwai at suse.de>
---
 include/sound/soc.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 6ce3e57..b27c7a2 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -820,7 +820,7 @@ struct soc_enum {
 	unsigned char shift_r;
 	unsigned int max;
 	unsigned int mask;
-	const char **texts;
+	const char * const *texts;
 	const unsigned int *values;
 	void *dapm;
 };
-- 
1.7.4.2