patch-2.3.50 linux/drivers/sound/gus_wave.c

• Lines: 47
• Date: Tue Mar 7 13:40:24 2000
• Orig file: v2.3.49/linux/drivers/sound/gus_wave.c
• Orig date: Sat Feb 26 22:31:49 2000

diff -u --recursive --new-file v2.3.49/linux/drivers/sound/gus_wave.c linux/drivers/sound/gus_wave.c
@@ -2,15 +2,15 @@
  * sound/gus_wave.c
  *
  * Driver for the Gravis UltraSound wave table synth.
- */
-/*
+ *
+ *
  * Copyright (C) by Hannu Savolainen 1993-1997
  *
  * OSS/Free for Linux is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)
  * Version 2 (June 1991). See the "COPYING" file distributed with this software
  * for more info.
- */
-/*
+ *
+ *
  * Thomas Sailer    : ioctl code reworked (vmalloc/vfree removed)
  * Frank van de Pol : Fixed GUS MAX interrupt handling. Enabled simultanious
  *                    usage of CS4231A codec, GUS wave and MIDI for GUS MAX.
@@ -23,6 +23,8 @@
 
 #include "sound_config.h"
 #include <linux/ultrasound.h>
+
+#include "gus.h"
 #include "gus_hw.h"
 
 #define GUS_BANK_SIZE (((iw_mode) ? 256*1024*1024 : 256*1024))
@@ -3012,7 +3014,7 @@
 			model_num = "MAX";
 			gus_type = 0x40;
 			mixer_type = CS4231;
-#ifdef CONFIG_GUSMAX
+#ifdef CONFIG_SOUND_GUSMAX
 			{
 				unsigned char   max_config = 0x40;	/* Codec enable */
 
@@ -3164,7 +3166,7 @@
 
 void gus_wave_unload(struct address_info *hw_config)
 {
-#ifdef CONFIG_GUSMAX
+#ifdef CONFIG_SOUND_GUSMAX
 	if (have_gus_max)
 	{
 		ad1848_unload(gus_base + 0x10c,