From: Takashi Iwai Subject: Re: ASoC updates for 2.6.40 Date: Tue, 03 May 2011 12:56:05 +0200 Message-ID: References: <20110503102734.GC1762@opensource.wolfsonmicro.com> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mx1.suse.de (cantor.suse.de [195.135.220.2]) by alsa0.perex.cz (Postfix) with ESMTP id 141DD1037FB for ; Tue, 3 May 2011 12:56:06 +0200 (CEST) In-Reply-To: <20110503102734.GC1762@opensource.wolfsonmicro.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: alsa-devel-bounces@alsa-project.org Errors-To: alsa-devel-bounces@alsa-project.org To: Mark Brown Cc: alsa-devel@alsa-project.org, Liam Girdwood List-Id: alsa-devel@alsa-project.org 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 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 --- 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