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

Next file: linux/drivers/sound/soundcard.c
Previous file: linux/drivers/sound/skeleton.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.2.0-pre7/linux/drivers/sound/sound_core.c linux/drivers/sound/sound_core.c
@@ -43,6 +43,7 @@
 #include <linux/fs.h>
 #include <linux/sound.h>
 #include <linux/major.h>
+#include <linux/kmod.h>
  
  
 struct sound_unit
@@ -317,7 +318,6 @@
 	
 	spin_lock(&sound_loader_lock);
 	s = __look_for_unit(chain, unit);
-#ifdef CONFIG_KMOD
 	if (s == NULL) {
 		char mod[32];
 	
@@ -336,7 +336,6 @@
 		spin_lock(&sound_loader_lock);
 		s = __look_for_unit(chain, unit);
 	}
-#endif
 	if (s) {
 		file->f_op=s->unit_fops;
 		spin_unlock(&sound_loader_lock);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov