summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2010-03-08 09:32:42 -0800
committerTakashi Iwai <tiwai@suse.de>2010-03-08 18:36:17 +0100
commit89c0ac7cab2440a771ba1e2ab953186bc9c29786 (patch)
tree920b4e4619e8e98c6c8d7e1ff351cf7bdbd6950d /sound
parent2b9ddcb8b2ce6a44f0f969000f16b016caa64294 (diff)
downloadop-kernel-dev-89c0ac7cab2440a771ba1e2ab953186bc9c29786.zip
op-kernel-dev-89c0ac7cab2440a771ba1e2ab953186bc9c29786.tar.gz
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>
Diffstat (limited to 'sound')
-rw-r--r--sound/isa/opti9xx/opti92x-ad1848.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c
index becd90d..4d2d040 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];
}
OpenPOWER on IntegriCloud