patch-2.1.102 linux/drivers/sound/uart6850.c

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

diff -u --recursive --new-file v2.1.101/linux/drivers/sound/uart6850.c linux/drivers/sound/uart6850.c
@@ -24,8 +24,10 @@
  */
 
 #include "sound_config.h"
+
+#ifdef CONFIG_SOUND_UART6850
+#ifdef CONFIG_MIDI
 #include "soundmodule.h"
-#if defined(CONFIG_UART6850) && defined(CONFIG_MIDI) || defined(MODULE)
 
 static int uart6850_base = 0x330;
 
@@ -351,5 +353,6 @@
 	unload_uart6850(&cfg);
 	SOUND_LOCK_END;
 }
+#endif
 #endif
 #endif

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