evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'topic/misc' into for-linus

Browse source
This commit is contained in:
Takashi Iwai 2010-03-10 09:01:30 +01:00
commit 0e49887703
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sound/isa/opti9xx/opti92x-ad1848.c
View file

@ -217,8 +217,9 @@ static int __devinit snd_opti9xx_init(struct snd_opti9xx *chip,
if (isapnp && chip->mc_base) if (isapnp && chip->mc_base)
/* PnP resource gives the least 10 bits */ /* PnP resource gives the least 10 bits */
chip->mc_base |= 0xc00; chip->mc_base |= 0xc00;
else
#endif /* CONFIG_PNP */ #endif /* CONFIG_PNP */
else { {
chip->mc_base = 0xf8c; chip->mc_base = 0xf8c;
chip->mc_base_size = opti9xx_mc_size[hardware]; chip->mc_base_size = opti9xx_mc_size[hardware];
} }