Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e498877 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/misc' into for-linus

parents 7d39cf62 89c0ac7c

sound/isa/opti9xx/opti92x-ad1848.c

+2 −1
Original line number Diff line number Diff line
@@ -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];

	}