patch-2.2.0-pre8 linux/drivers/sound/soundcard.c

• Lines: 29
• Date: Fri Jan 15 17:46:27 1999
• Orig file: v2.2.0-pre7/linux/drivers/sound/soundcard.c
• Orig date: Mon Jan 4 15:08:17 1999

diff -u --recursive --new-file v2.2.0-pre7/linux/drivers/sound/soundcard.c linux/drivers/sound/soundcard.c
@@ -456,13 +456,11 @@
 
 	case SND_DEV_CTL:
 		dev >>= 4;
-#ifdef CONFIG_KMOD
 		if (dev >= 0 && dev < MAX_MIXER_DEV && mixer_devs[dev] == NULL) {
 			char modname[20];
 			sprintf(modname, "mixer%d", dev);
 			request_module(modname);
 		}
-#endif
 		if (dev && (dev >= num_mixers || mixer_devs[dev] == NULL))
 			return -ENXIO;
 		break;
@@ -578,14 +576,12 @@
 {
  	if (mixdev < 0 || mixdev >= MAX_MIXER_DEV)
  		return -ENXIO;
-#ifdef CONFIG_KMOD
  	/* Try to load the mixer... */
  	if (mixer_devs[mixdev] == NULL) {
  		char modname[20];
  		sprintf(modname, "mixer%d", mixdev);
  		request_module(modname);
  	}
-#endif	/* CONFIG_KMOD */
  	if (mixdev >= num_mixers || !mixer_devs[mixdev])
  		return -ENXIO;
 	if (cmd == SOUND_MIXER_INFO)