diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-13 14:39:54 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-13 14:39:54 -0800 |
commit | 461d208cfbd1f0af26027b2c35ded515e54b1ee6 (patch) | |
tree | 30384817c1567db054e499c1ed964b37c7c76a2a /sound/isa/opti9xx | |
parent | 9fdfbc2bff587f454dd95e2caa6d147c9abe39e4 (diff) | |
parent | 0e49887703015dd73667664c5abc9a6366641da9 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: hda - Sound MSI fallout on a Asus mobo NVIDIA MCP55
sound: fix opti92x-ad1848 build
ALSA: hda - Fix input source elements of secondary ADCs on Realtek
ALSA: hda - Fix wrong model range check for ALC268
Diffstat (limited to 'sound/isa/opti9xx')
-rw-r--r-- | sound/isa/opti9xx/opti92x-ad1848.c | 3 |
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]; } |