summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-03-10 11:01:30 +0300
committerTakashi Iwai <tiwai@suse.de>2010-03-10 11:01:30 +0300
commit0e49887703015dd73667664c5abc9a6366641da9 (patch)
treee8459bc6dd930ef83e74b68d1d37ac0aceef00ce /sound
parent7d39cf62242d52729ddff9a9ae195669f462d5c4 (diff)
parent89c0ac7cab2440a771ba1e2ab953186bc9c29786 (diff)
downloadlinux-0e49887703015dd73667664c5abc9a6366641da9.tar.xz
Merge branch 'topic/misc' into for-linus
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 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];
}