From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Mon, 8 Mar 2010 17:32:42 +0000 (-0800)
Subject: sound: fix opti92x-ad1848 build
X-Git-Tag: MMI-PSA29.97-13-9~24353^2~2^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=89c0ac7cab2440a771ba1e2ab953186bc9c29786;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

sound: fix opti92x-ad1848 build

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>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c
index becd90d7536d..4d2d0405bdc7 100644
--- a/sound/isa/opti9xx/opti92x-ad1848.c
+++ b/sound/isa/opti9xx/opti92x-ad1848.c
@@ -217,8 +217,9 @@ static int __devinit snd_opti9xx_init(struct snd_opti9xx *chip,
 	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];
 	}