patch-1.3.18 linux/drivers/sound/pss.c

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

diff -u --recursive --new-file v1.3.17/linux/drivers/sound/pss.c linux/drivers/sound/pss.c
@@ -395,10 +395,10 @@
 	break;			/* No more input */
     }
 
-#ifdef EXCLUDE_MIDI
-  return 0;
-#else
+#if (!defined(EXCLUDE_MPU401) || !defined(EXCLUDE_MPU_EMU)) && !defined(EXCLUDE_MIDI)
   return probe_mpu401 (hw_config);
+#else
+  return 0
 #endif
 }
 
@@ -662,7 +662,7 @@
   int             prev_devs;
   long            ret;
 
-#ifndef EXCLUDE_MIDI
+#if (!defined(EXCLUDE_MPU401) || !defined(EXCLUDE_MPU_EMU)) && !defined(EXCLUDE_MIDI)
   prev_devs = num_midis;
   ret = attach_mpu401 (mem_start, hw_config);
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this