patch-2.1.109 linux/drivers/sound/msnd_pinnacle.c

• Lines: 47
• Date: Mon Jul 13 12:43:04 1998
• Orig file: v2.1.108/linux/drivers/sound/msnd_pinnacle.c
• Orig date: Wed Jul 1 19:38:55 1998

diff -u --recursive --new-file v2.1.108/linux/drivers/sound/msnd_pinnacle.c linux/drivers/sound/msnd_pinnacle.c
@@ -2,7 +2,7 @@
  *
  * msnd_pinnacle.c - Support for Turtle Beach Pinnacle and Fiji
  *
- * Turtle Beach MultiSound Soundcard Driver for Linux
+ * Turtle Beach MultiSound Sound Card Driver for Linux
  *
  * Copyright (C) 1998 Andrew Veliath
  *
@@ -24,6 +24,7 @@
  *
  ********************************************************************/
 
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/malloc.h>
 #include <linux/types.h>
@@ -1211,10 +1212,18 @@
 static int irq __initdata =		-1;
 static int mem __initdata =		-1;
 static int fifosize __initdata =	DEFFIFOSIZE;
-static int
-calibrate_signal __initdata =		0;
+static int calibrate_signal __initdata;
 
 int init_module(void)
+#else
+static int io __initdata =		CONFIG_MSNDPIN_IO;
+static int irq __initdata =		CONFIG_MSNDPIN_IRQ;
+static int mem __initdata =		CONFIG_MSNDPIN_MEM;
+static int fifosize __initdata =	DEFFIFOSIZE;
+static int calibrate_signal __initdata;
+
+__initfunc(int msnd_pinnacle_init(void))
+#endif
 {
 	int err;
 
@@ -1323,6 +1332,8 @@
 
 	return 0;
 }
+
+#ifdef MODULE
 
 void cleanup_module(void)
 {