[Linux-mips-commits]CVS: linux/drivers/sound Config.in,1.7,1.8 Makefile,1.7,1.8 au1000.c,1.3,1.4 ite8172.c,1.1.1.1,NONE

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/sound
In directory usw-pr-cvs1:/tmp/cvs-serv13849/drivers/sound

Modified Files:
	Config.in Makefile au1000.c 
Removed Files:
	ite8172.c 
Log Message:
Synced to 2.4.10.

Index: Config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/sound/Config.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Config.in	2001/09/25 03:36:35	1.7
+++ Config.in	2001/10/19 21:19:39	1.8
@@ -206,3 +206,13 @@
 fi
 
 dep_tristate '  TV card (bt848) mixer support' CONFIG_SOUND_TVMIXER $CONFIG_SOUND $CONFIG_I2C
+
+# A cross directory dependence. The sound modules will need gameport.o compiled in,
+# but it resides in the drivers/char/joystick directory. This define_tristate takes
+# care of that. --Vojtech
+
+if [ "$CONFIG_INPUT_GAMEPORT" != "n" ]; then
+  if [ "$CONFIG_SOUND_ESSSOLO1" = "y" -o "$CONFIG_SOUND_ES1370" = "y" -o "$CONFIG_SOUND_ES1371" = "y" -o "$CONFIG_SOUND_SONICVIBES" = "y" ]; then
+    define_tristate CONFIG_INPUT_GAMEPORT y
+  fi
+fi

Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/sound/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile	2001/09/25 03:36:35	1.7
+++ Makefile	2001/10/19 21:19:39	1.8
@@ -70,10 +70,11 @@
 obj-$(CONFIG_SOUND_MAESTRO)	+= maestro.o
 obj-$(CONFIG_SOUND_MAESTRO3)	+= maestro3.o ac97_codec.o
 obj-$(CONFIG_SOUND_TRIDENT)	+= trident.o ac97_codec.o
-obj-$(CONFIG_SOUND_RME96XX)	+= rme96xx.o
+obj-$(CONFIG_SOUND_EMU10K1)	+= ac97_codec.o
+obj-$(CONFIG_SOUND_RME96XX)     += rme96xx.o
 obj-$(CONFIG_SOUND_BT878)	+= btaudio.o
-
 obj-$(CONFIG_SOUND_EMU10K1)	+= ac97_codec.o
+
 ifeq ($(CONFIG_MIDI_EMU10K1),y)
   obj-$(CONFIG_SOUND_EMU10K1)	+= sound.o
 endif

Index: au1000.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/sound/au1000.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- au1000.c	2001/09/25 03:36:35	1.3
+++ au1000.c	2001/10/19 21:19:39	1.4
@@ -92,62 +92,62 @@
 #define AC97_EXT_DACS (AC97_EXTID_SDAC | AC97_EXTID_CDAC | AC97_EXTID_LDAC)
 
 /* Boot options */
-static int vra = 0;  // 0 = no VRA, 1 = use VRA if codec supports it
+static int      vra = 0;	// 0 = no VRA, 1 = use VRA if codec supports it
 
 
 /* --------------------------------------------------------------------- */
 
 struct au1000_state {
-    /* soundcore stuff */
[...3238 lines suppressed...]
-        return 0;
+	if (!options || !*options)
+		return 0;
 
 	for (this_opt = strtok(options, ","); this_opt;
 	     this_opt = strtok(NULL, ",")) {
-	if (!strncmp(this_opt, "vra", 3)) {
-	    vra = 1;
+		if (!strncmp(this_opt, "vra", 3)) {
+			vra = 1;
+		}
 	}
-    }
-    
-    return 1;
+
+	return 1;
 }
 
 __setup("au1000_audio=", au1000_setup);

--- ite8172.c DELETED ---