From: Randy Dunlap <randy.dunlap@oracle.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.de>
Subject: [PATCH -next] sound: fix opti92x-ad1848 build
Date: Mon, 08 Mar 2010 09:32:42 -0800 [thread overview]
Message-ID: <4B9534BA.4020903@oracle.com> (raw)
In-Reply-To: <20100308152740.a007e8cb.sfr@canb.auug.org.au>
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>
---
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];
}
next prev parent reply other threads:[~2010-03-08 17:33 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-08 4:27 linux-next: Tree for March 8 Stephen Rothwell
2010-03-08 17:25 ` linux-next: Tree for March 8 (mtd) Randy Dunlap
2010-03-09 2:49 ` David Woodhouse
2010-03-09 17:06 ` Randy Dunlap
2010-03-08 17:32 ` Randy Dunlap [this message]
2010-03-08 17:37 ` [PATCH -next] sound: fix opti92x-ad1848 build Takashi Iwai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4B9534BA.4020903@oracle.com \
--to=randy.dunlap@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=perex@perex.cz \
--cc=sfr@canb.auug.org.au \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).