patch-2.0.4 linux/drivers/sound/sscape.c

Next file: linux/fs/ext2/super.c
Previous file: linux/drivers/sound/sb_common.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.0.3/linux/drivers/sound/sscape.c linux/drivers/sound/sscape.c
@@ -304,7 +304,7 @@
       printk ("SSCAPE: Host interrupt, data=%02x\n", host_read (devc));
     }
 
-#if defined(CONFIG_MPU401) && defined(CONFIG_MIDI)
+#if defined(CONFIG_MPU_EMU) && defined(CONFIG_MIDI)
   if (bits & 0x01)
     {
       mpuintr (irq, NULL, NULL);
@@ -787,7 +787,7 @@
   }
 #endif
 
-#if defined(CONFIG_MIDI) && defined(CONFIG_MPU401)
+#if defined(CONFIG_MIDI) && defined(CONFIG_MPU_EMU)
   if (probe_mpu401 (hw_config))
     hw_config->always_detect = 1;
   {
@@ -990,7 +990,7 @@
 void
 unload_sscape (struct address_info *hw_config)
 {
-#if defined(CONFIG_MPU401) && defined(CONFIG_MIDI)
+#if defined(CONFIG_MPU_EMU) && defined(CONFIG_MIDI)
   unload_mpu401 (hw_config);
 #endif
   snd_release_irq (hw_config->irq);

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