ALSA CVS update - Takashi Iwai <tiwai@suse.de>

CS4236+ driver
- fixed the detection of combination of pnp and non-pnp devices.

sound/isa/cs423x/cs4236.c

@@ -544,7 +544,7 @@ static int __devinit snd_cs423x_pnp_detect(struct pnp_card_link *card,
 	int res;
 
 	for ( ; dev < SNDRV_CARDS; dev++) {
-		if (!enable[dev])
+		if (!enable[dev] || !isapnp[dev])
 			continue;
 		res = snd_card_cs423x_probe(dev, card, id);
 		if (res < 0)