From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754917Ab0CHRhe (ORCPT <rfc822;w@1wt.eu>);
	Mon, 8 Mar 2010 12:37:34 -0500
Received: from cantor.suse.de ([195.135.220.2]:36497 "EHLO mx1.suse.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1753922Ab0CHRh2 (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Mon, 8 Mar 2010 12:37:28 -0500
Date: Mon, 08 Mar 2010 18:37:27 +0100
Message-ID: <s5h3a0azpd4.wl%tiwai@suse.de>
From: Takashi Iwai <tiwai@suse.de>
To: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>, linux-next@vger.kernel.org,
       LKML <linux-kernel@vger.kernel.org>, Jaroslav Kysela <perex@perex.cz>
Subject: Re: [PATCH -next] sound: fix opti92x-ad1848 build
In-Reply-To: <4B9534BA.4020903@oracle.com>
References: <20100308152740.a007e8cb.sfr@canb.auug.org.au>
	<4B9534BA.4020903@oracle.com>
User-Agent: Wanderlust/2.15.6 (Almost Unreal) SEMI/1.14.6 (Maruoka)
 FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.7 Emacs/23.1
 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO)
MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-Type: text/plain; charset=US-ASCII
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

At Mon, 08 Mar 2010 09:32:42 -0800,
Randy Dunlap wrote:
> 
> From: Randy Dunlap <randy.dunlap@oracle.com>
> 
> Fix 'else' placement in ifdef block so that build succeeds:
> 
> sound/isa/opti9xx/opti92x-ad1848.c:221: error: 'else' without a previous 'if'
> 
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> Cc:	Jaroslav Kysela <perex@perex.cz>
> Cc:	Takashi Iwai <tiwai@suse.de>

Applied.  Thanks!


Takashi

> ---
>  sound/isa/opti9xx/opti92x-ad1848.c |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> --- linux-next-20100308.orig/sound/isa/opti9xx/opti92x-ad1848.c
> +++ linux-next-20100308/sound/isa/opti9xx/opti92x-ad1848.c
> @@ -217,8 +217,9 @@ static int __devinit snd_opti9xx_init(st
>  	if (isapnp && chip->mc_base)
>  		/* PnP resource gives the least 10 bits */
>  		chip->mc_base |= 0xc00;
> +	else
>  #endif	/* CONFIG_PNP */
> -	else {
> +	{
>  		chip->mc_base = 0xf8c;
>  		chip->mc_base_size = opti9xx_mc_size[hardware];
>  	}
>