projects
/
platform
/
kernel
/
linux-3.10.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2b9ddcb
)
sound: fix opti92x-ad1848 build
author
Randy Dunlap
<randy.dunlap@oracle.com>
Mon, 8 Mar 2010 17:32:42 +0000
(09:32 -0800)
committer
Takashi Iwai
<tiwai@suse.de>
Mon, 8 Mar 2010 17:36:17 +0000
(18:36 +0100)
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>
sound/isa/opti9xx/opti92x-ad1848.c
patch
|
blob
|
history
diff --git
a/sound/isa/opti9xx/opti92x-ad1848.c
b/sound/isa/opti9xx/opti92x-ad1848.c
index
becd90d
..
4d2d040
100644
(file)
--- 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];
}