patch-2.1.67 linux/drivers/sound/sound_config.h

Next file: linux/drivers/sound/sound_firmware.c
Previous file: linux/drivers/sound/sound_calls.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.66/linux/drivers/sound/sound_config.h linux/drivers/sound/sound_config.h
@@ -11,7 +11,7 @@
  */
 
 
-#include "local.h"
+#include "local.h.master"
 
 #include "os.h"
 #include "soundvers.h"
@@ -116,7 +116,9 @@
 	int driver_use_1;	/* Driver defined field 1 */
 	int driver_use_2;	/* Driver defined field 2 */
 	int *osp;	/* OS specific info */
-	int card_subtype;	/* Driver spesific. Usually 0 */
+	int card_subtype;	/* Driver specific. Usually 0 */
+	void *memptr;           /* Module memory chainer */
+	int slots[6];           /* To remember driver slot ids */
 };
 
 #define SYNTH_MAX_VOICES	32
@@ -163,5 +165,17 @@
 #define DDB(x) {}
 #endif
 
+#ifndef MDB
+#ifdef MODULE
+#define MDB(x) x
+#else
+#define MDB(x)
+#endif
+#endif
+
 #define TIMER_ARMED	121234
 #define TIMER_NOT_ARMED	1
+
+
+
+

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