diff -uN old/au8810.c new/au8810.c
--- old/au8810.c	2004-02-03 13:15:21.000000000 -0500
+++ new/au8810.c	2004-02-03 17:41:38.000000000 -0500
@@ -7,3 +7,9 @@
 };
 
 #include "au88x0.c"
+#include "au88x0_core.c"
+#include "au88x0_eq.c"
+#include "au88x0_game.c"
+#include "au88x0_mixer.c"
+#include "au88x0_mpu401.c"
+#include "au88x0_pcm.c"
diff -uN old/au8810_core.c new/au8810_core.c
--- old/au8810_core.c	2004-02-03 13:15:21.000000000 -0500
+++ new/au8810_core.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,3 +0,0 @@
-#define __NO_VERSION__
-#include "au8810.h"
-#include "au88x0_core.c"
diff -uN old/au8810_eq.c new/au8810_eq.c
--- old/au8810_eq.c	2004-02-03 13:15:21.000000000 -0500
+++ new/au8810_eq.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,3 +0,0 @@
-#define __NO_VERSION__
-#include "au8810.h"
-#include "au88x0_eq.c"
diff -uN old/au8810_game.c new/au8810_game.c
--- old/au8810_game.c	2004-02-03 13:15:21.000000000 -0500
+++ new/au8810_game.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,3 +0,0 @@
-#define __NO_VERSION__
-#include "au8810.h"
-#include "au88x0_game.c"
diff -uN old/au8810_mixer.c new/au8810_mixer.c
--- old/au8810_mixer.c	2004-02-03 13:15:21.000000000 -0500
+++ new/au8810_mixer.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,3 +0,0 @@
-#define __NO_VERSION__
-#include "au8810.h"
-#include "au88x0_mixer.c"
diff -uN old/au8810_mpu401.c new/au8810_mpu401.c
--- old/au8810_mpu401.c	2004-02-03 13:15:21.000000000 -0500
+++ new/au8810_mpu401.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,3 +0,0 @@
-#define __NO_VERSION__
-#include "au8810.h"
-#include "au88x0_mpu401.c"
diff -uN old/au8810_pcm.c new/au8810_pcm.c
--- old/au8810_pcm.c	2004-02-03 13:15:21.000000000 -0500
+++ new/au8810_pcm.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,3 +0,0 @@
-#define __NO_VERSION__
-#include "au8810.h"
-#include "au88x0_pcm.c"
diff -uN old/au8820.c new/au8820.c
--- old/au8820.c	2004-02-03 13:15:21.000000000 -0500
+++ new/au8820.c	2004-02-03 17:41:38.000000000 -0500
@@ -7,3 +7,9 @@
 };
 
 #include "au88x0.c"
+#include "au88x0_core.c"
+#include "au88x0_game.c"
+#include "au88x0_mixer.c"
+#include "au88x0_mpu401.c"
+#include "au88x0_pcm.c"
+#include "au88x0_synth.c"
diff -uN old/au8820_core.c new/au8820_core.c
--- old/au8820_core.c	2004-02-03 13:15:21.000000000 -0500
+++ new/au8820_core.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,3 +0,0 @@
-#define __NO_VERSION__
-#include "au8820.h"
-#include "au88x0_core.c"
diff -uN old/au8820_game.c new/au8820_game.c
--- old/au8820_game.c	2004-02-03 13:15:21.000000000 -0500
+++ new/au8820_game.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,3 +0,0 @@
-#define __NO_VERSION__
-#include "au8820.h"
-#include "au88x0_game.c"
diff -uN old/au8820_mixer.c new/au8820_mixer.c
--- old/au8820_mixer.c	2004-02-03 13:15:21.000000000 -0500
+++ new/au8820_mixer.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,3 +0,0 @@
-#define __NO_VERSION__
-#include "au8820.h"
-#include "au88x0_mixer.c"
diff -uN old/au8820_mpu401.c new/au8820_mpu401.c
--- old/au8820_mpu401.c	2004-02-03 13:15:21.000000000 -0500
+++ new/au8820_mpu401.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,3 +0,0 @@
-#define __NO_VERSION__
-#include "au8820.h"
-#include "au88x0_mpu401.c"
diff -uN old/au8820_pcm.c new/au8820_pcm.c
--- old/au8820_pcm.c	2004-02-03 13:15:21.000000000 -0500
+++ new/au8820_pcm.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,3 +0,0 @@
-#define __NO_VERSION__
-#include "au8820.h"
-#include "au88x0_pcm.c"
diff -uN old/au8820_synth.c new/au8820_synth.c
--- old/au8820_synth.c	2004-02-03 13:15:21.000000000 -0500
+++ new/au8820_synth.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,3 +0,0 @@
-#define __NO_VERSION__
-#include "au8820.h"
-#include "au88x0_synth.c"
diff -uN old/au8830.c new/au8830.c
--- old/au8830.c	2004-02-03 13:15:21.000000000 -0500
+++ new/au8830.c	2004-02-03 17:41:38.000000000 -0500
@@ -7,3 +7,10 @@
 };
 
 #include "au88x0.c"
+#include "au88x0_core.c"
+#include "au88x0_eq.c"
+#include "au88x0_game.c"
+#include "au88x0_mixer.c"
+#include "au88x0_mpu401.c"
+#include "au88x0_pcm.c"
+#include "au88x0_synth.c"
diff -uN old/au8830_core.c new/au8830_core.c
--- old/au8830_core.c	2004-02-03 13:15:21.000000000 -0500
+++ new/au8830_core.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,3 +0,0 @@
-#define __NO_VERSION__
-#include "au8830.h"
-#include "au88x0_core.c"
diff -uN old/au8830_eq.c new/au8830_eq.c
--- old/au8830_eq.c	2004-02-03 13:15:21.000000000 -0500
+++ new/au8830_eq.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,3 +0,0 @@
-#define __NO_VERSION__
-#include "au8830.h"
-#include "au88x0_eq.c"
diff -uN old/au8830_game.c new/au8830_game.c
--- old/au8830_game.c	2004-02-03 13:15:21.000000000 -0500
+++ new/au8830_game.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,3 +0,0 @@
-#define __NO_VERSION__
-#include "au8830.h"
-#include "au88x0_game.c"
diff -uN old/au8830_mixer.c new/au8830_mixer.c
--- old/au8830_mixer.c	2004-02-03 13:15:21.000000000 -0500
+++ new/au8830_mixer.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,3 +0,0 @@
-#define __NO_VERSION__
-#include "au8830.h"
-#include "au88x0_mixer.c"
diff -uN old/au8830_mpu401.c new/au8830_mpu401.c
--- old/au8830_mpu401.c	2004-02-03 13:15:21.000000000 -0500
+++ new/au8830_mpu401.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,3 +0,0 @@
-#define __NO_VERSION__
-#include "au8830.h"
-#include "au88x0_mpu401.c"
diff -uN old/au8830_pcm.c new/au8830_pcm.c
--- old/au8830_pcm.c	2004-02-03 13:15:21.000000000 -0500
+++ new/au8830_pcm.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,3 +0,0 @@
-#define __NO_VERSION__
-#include "au8830.h"
-#include "au88x0_pcm.c"
diff -uN old/au8830_synth.c new/au8830_synth.c
--- old/au8830_synth.c	2004-02-03 13:15:21.000000000 -0500
+++ new/au8830_synth.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,3 +0,0 @@
-#define __NO_VERSION__
-#include "au8830.h"
-#include "au88x0_synth.c"
diff -uN old/au88x0_core.c new/au88x0_core.c
--- old/au88x0_core.c	2004-02-03 13:15:21.000000000 -0500
+++ new/au88x0_core.c	2004-02-03 17:41:38.000000000 -0500
@@ -80,21 +80,21 @@
 /*  MIXER (CAsp4Mix.s and CAsp4Mixer.s) */
 
 // FIXME: get rid of this.
-int mchannels[NR_MIXIN];
-int rampchs[NR_MIXIN];
+static int mchannels[NR_MIXIN];
+static int rampchs[NR_MIXIN];
 
-void vortex_mixer_en_sr(vortex_t * vortex, int channel)
+static void vortex_mixer_en_sr(vortex_t * vortex, int channel)
 {
 	hwwrite(vortex->mmio, VORTEX_MIXER_SR,
 		hwread(vortex->mmio, VORTEX_MIXER_SR) | (0x1 << channel));
 }
-void vortex_mixer_dis_sr(vortex_t * vortex, int channel)
+static void vortex_mixer_dis_sr(vortex_t * vortex, int channel)
 {
 	hwwrite(vortex->mmio, VORTEX_MIXER_SR,
 		hwread(vortex->mmio, VORTEX_MIXER_SR) & ~(0x1 << channel));
 }
 
-void vortex_mix_muteinputgain(vortex_t * vortex, unsigned char mix,
+static void vortex_mix_muteinputgain(vortex_t * vortex, unsigned char mix,
 			      unsigned char channel)
 {
 	hwwrite(vortex->mmio, VORTEX_MIX_INVOL_A + ((mix << 5) + channel),
@@ -103,7 +103,7 @@
 		0x80);
 }
 
-int vortex_mix_getvolume(vortex_t * vortex, unsigned char mix)
+static int vortex_mix_getvolume(vortex_t * vortex, unsigned char mix)
 {
 	int a;
 	a = hwread(vortex->mmio, VORTEX_MIX_VOL_A + (mix << 2)) & 0xff;
@@ -111,7 +111,7 @@
 	return (a);
 }
 
-void vortex_mix_setvolumebyte(vortex_t * vortex, unsigned char mix,
+static void vortex_mix_setvolumebyte(vortex_t * vortex, unsigned char mix,
 			      unsigned char vol)
 {
 	int temp;
@@ -124,7 +124,7 @@
 	hwwrite(vortex->mmio, VORTEX_MIX_VOL_B + (mix << 2), vol);
 }
 
-int vortex_mix_getinputvolume(vortex_t * vortex, unsigned char mix,
+static int vortex_mix_getinputvolume(vortex_t * vortex, unsigned char mix,
 			      int channel, int *vol)
 {
 	int a;
@@ -142,7 +142,7 @@
 	return (0);
 }
 
-void vortex_mix_setinputvolumebyte(vortex_t * vortex, unsigned char mix,
+static void vortex_mix_setinputvolumebyte(vortex_t * vortex, unsigned char mix,
 				   int mixin, unsigned char vol)
 {
 	int temp;
@@ -161,7 +161,7 @@
 		VORTEX_MIX_INVOL_B + (((mix << 5) + mixin) << 2), vol);
 }
 
-int vortex_mix_getenablebit(vortex_t * vortex, unsigned char mix,
+static int vortex_mix_getenablebit(vortex_t * vortex, unsigned char mix,
 			    int mixin)
 {
 	int addr, temp;
@@ -174,7 +174,7 @@
 	return ((temp >> (mixin & 3)) & 1);
 }
 
-void vortex_mix_setenablebit(vortex_t * vortex, unsigned char mix,
+static void vortex_mix_setenablebit(vortex_t * vortex, unsigned char mix,
 			     int mixin, int en)
 {
 	int temp, addr;
@@ -199,7 +199,7 @@
 	hwwrite(vortex->mmio, VORTEX_MIX_ENIN + addr, temp);
 }
 
-void vortex_mix_killinput(vortex_t * vortex, unsigned char mix, int mixin)
+static void vortex_mix_killinput(vortex_t * vortex, unsigned char mix, int mixin)
 {
 	rampchs[mix] &= ~(1 << mixin);
 	vortex_mix_setinputvolumebyte(vortex, mix, mixin, 0x80);
@@ -207,7 +207,7 @@
 	vortex_mix_setenablebit(vortex, mix, mixin, 0);
 }
 
-void vortex_mix_enableinput(vortex_t * vortex, unsigned char mix,
+static void vortex_mix_enableinput(vortex_t * vortex, unsigned char mix,
 			    int mixin)
 {
 	vortex_mix_killinput(vortex, mix, mixin);
@@ -218,7 +218,7 @@
 	vortex_mix_setenablebit(vortex, mix, mixin, 1);
 }
 
-void vortex_mix_disableinput(vortex_t * vortex, unsigned char mix,
+static void vortex_mix_disableinput(vortex_t * vortex, unsigned char mix,
 			     int channel, int ramp)
 {
 	if (ramp) {
@@ -230,7 +230,7 @@
 		vortex_mix_killinput(vortex, mix, channel);
 }
 
-int vortex_mixer_addWTD(vortex_t * vortex, unsigned char mix,
+static int vortex_mixer_addWTD(vortex_t * vortex, unsigned char mix,
 			unsigned char ch)
 {
 	int temp, lifeboat = 0, prev;
@@ -261,7 +261,7 @@
 	return 1;
 }
 
-int vortex_mixer_delWTD(vortex_t * vortex, unsigned char mix,
+static int vortex_mixer_delWTD(vortex_t * vortex, unsigned char mix,
 			unsigned char ch)
 {
 	int esp14 = -1, esp18, eax, ebx, edx, ebp, esi = 0;
@@ -344,12 +344,12 @@
 	return 1;
 }
 
-unsigned int vortex_mix_boost6db(unsigned char vol)
+static unsigned int vortex_mix_boost6db(unsigned char vol)
 {
 	return (vol + 8);	/* WOW! what a complex function! */
 }
 
-void vortex_mix_rampvolume(vortex_t * vortex, int mix)
+static void vortex_mix_rampvolume(vortex_t * vortex, int mix)
 {
 	int ch;
 	char a;
@@ -372,7 +372,7 @@
 	}
 }
 
-void vortex_mixer_init(vortex_t * vortex)
+static void vortex_mixer_init(vortex_t * vortex)
 {
 	unsigned long addr;
 	int x;
@@ -431,21 +431,21 @@
 
 /*  SRC (CAsp4Src.s and CAsp4SrcBlock) */
 
-void vortex_src_en_sr(vortex_t * vortex, int channel)
+static void vortex_src_en_sr(vortex_t * vortex, int channel)
 {
 	hwwrite(vortex->mmio, VORTEX_SRCBLOCK_SR,
 		hwread(vortex->mmio,
 		       VORTEX_SRCBLOCK_SR) | (0x1 << channel));
 }
 
-void vortex_src_dis_sr(vortex_t * vortex, int channel)
+static void vortex_src_dis_sr(vortex_t * vortex, int channel)
 {
 	hwwrite(vortex->mmio, VORTEX_SRCBLOCK_SR,
 		hwread(vortex->mmio,
 		       VORTEX_SRCBLOCK_SR) & ~(0x1 << channel));
 }
 
-void vortex_src_flushbuffers(vortex_t * vortex, unsigned char src)
+static void vortex_src_flushbuffers(vortex_t * vortex, unsigned char src)
 {
 	int i;
 
@@ -456,14 +456,14 @@
 	hwwrite(vortex->mmio, VORTEX_SRC_DATA + (src << 3) + 4, 0);
 }
 
-void vortex_src_cleardrift(vortex_t * vortex, unsigned char src)
+static void vortex_src_cleardrift(vortex_t * vortex, unsigned char src)
 {
 	hwwrite(vortex->mmio, VORTEX_SRC_DRIFT0 + (src << 2), 0);
 	hwwrite(vortex->mmio, VORTEX_SRC_DRIFT1 + (src << 2), 0);
 	hwwrite(vortex->mmio, VORTEX_SRC_DRIFT2 + (src << 2), 1);
 }
 
-void vortex_src_slowlock(vortex_t * vortex, unsigned char src)
+static void vortex_src_slowlock(vortex_t * vortex, unsigned char src)
 {
 	int temp;
 
@@ -475,7 +475,7 @@
 			temp & ~0x200L);
 }
 
-void vortex_src_set_throttlesource(vortex_t * vortex, unsigned char src,
+static void vortex_src_set_throttlesource(vortex_t * vortex, unsigned char src,
 				   int en)
 {
 	int temp;
@@ -488,7 +488,7 @@
 	hwwrite(vortex->mmio, VORTEX_SRC_SOURCE, temp);
 }
 
-int vortex_src_persist_convratio(vortex_t * vortex, unsigned char src,
+static int vortex_src_persist_convratio(vortex_t * vortex, unsigned char src,
 				 int ratio)
 {
 	int temp, lifeboat = 0;
@@ -507,7 +507,7 @@
 	return temp;
 }
 
-void vortex_src_change_convratio(vortex_t * vortex, unsigned char src,
+static void vortex_src_change_convratio(vortex_t * vortex, unsigned char src,
 				 int ratio)
 {
 	int temp, a;
@@ -527,7 +527,7 @@
 	vortex_src_persist_convratio(vortex, src, ratio);
 }
 
-int vortex_src_checkratio(vortex_t * vortex, unsigned char src,
+static int vortex_src_checkratio(vortex_t * vortex, unsigned char src,
 			  unsigned int desired_ratio)
 {
 	int hw_ratio, lifeboat = 0;
@@ -549,7 +549,7 @@
 	return hw_ratio;
 }
 
-void vortex_src_setupchannel(vortex_t * card, unsigned char src,
+static void vortex_src_setupchannel(vortex_t * card, unsigned char src,
 			     unsigned int cvr, unsigned int b, int c,
 			     int d, int dirplay, int f, unsigned int g,
 			     int thsource)
@@ -619,7 +619,7 @@
 	//printk(KERN_INFO "vortex: SRC %d, d=0x%x, esi=0x%x, esp10=0x%x, ebp=0x%x\n", src, d, esi, esp10, ebp);
 }
 
-void vortex_srcblock_init(vortex_t * vortex)
+static void vortex_srcblock_init(vortex_t * vortex)
 {
 	unsigned long addr;
 	int x;
@@ -645,7 +645,7 @@
 	}
 }
 
-int vortex_src_addWTD(vortex_t * vortex, unsigned char src,
+static int vortex_src_addWTD(vortex_t * vortex, unsigned char src,
 		      unsigned char ch)
 {
 	int temp, lifeboat = 0, prev;
@@ -678,7 +678,7 @@
 	return 1;
 }
 
-int vortex_src_delWTD(vortex_t * vortex, unsigned char src,
+static int vortex_src_delWTD(vortex_t * vortex, unsigned char src,
 		      unsigned char ch)
 {
 	int esp14 = -1, esp18, eax, ebx, edx, ebp, esi = 0;
@@ -767,7 +767,7 @@
 			(((fifo << FIFO_SIZE_BITS) + x) << 2), 0);
 }
 
-void vortex_fifo_clearwtdata(vortex_t * vortex, int fifo, int x)
+static void vortex_fifo_clearwtdata(vortex_t * vortex, int fifo, int x)
 {
 	if (x < 1)
 		return;
@@ -777,7 +777,7 @@
 			(((fifo << FIFO_SIZE_BITS) + x) << 2), 0);
 }
 
-void vortex_fifo_init(vortex_t * vortex)
+static void vortex_fifo_init(vortex_t * vortex)
 {
 	int x;
 	unsigned long addr;
@@ -815,7 +815,7 @@
 #endif
 }
 
-void vortex_fifo_adbinitialize(vortex_t * vortex, int fifo, int j)
+static void vortex_fifo_adbinitialize(vortex_t * vortex, int fifo, int j)
 {
 	vortex_fifo_clearadbdata(vortex, fifo, FIFO_SIZE);
 #ifdef CHIP_AU8820
@@ -827,7 +827,7 @@
 #endif
 }
 
-void vortex_fifo_wtinitialize(vortex_t * vortex, int fifo, int j)
+static void vortex_fifo_wtinitialize(vortex_t * vortex, int fifo, int j)
 {
 	vortex_fifo_clearwtdata(vortex, fifo, FIFO_SIZE);
 #ifdef CHIP_AU8820
@@ -839,21 +839,21 @@
 #endif
 }
 
-void vortex_fifo_setadbvalid(vortex_t * vortex, int fifo, int en)
+static void vortex_fifo_setadbvalid(vortex_t * vortex, int fifo, int en)
 {
 	hwwrite(vortex->mmio, VORTEX_FIFO_ADBCTRL + (fifo << 2),
 		(hwread(vortex->mmio, VORTEX_FIFO_ADBCTRL + (fifo << 2)) &
 		 0xffffffef) | ((1 & en) << 4) | FIFO_U1);
 }
 
-void vortex_fifo_setwtvalid(vortex_t * vortex, int fifo, int en)
+static void vortex_fifo_setwtvalid(vortex_t * vortex, int fifo, int en)
 {
 	hwwrite(vortex->mmio, VORTEX_FIFO_WTCTRL + (fifo << 2),
 		(hwread(vortex->mmio, VORTEX_FIFO_WTCTRL + (fifo << 2)) &
 		 0xffffffef) | ((en & 1) << 4) | FIFO_U1);
 }
 
-void vortex_fifo_setadbctrl(vortex_t * vortex, int fifo, int b,
+static void vortex_fifo_setadbctrl(vortex_t * vortex, int fifo, int b,
 			    int priority, int empty, int valid, int f)
 {
 	int temp, lifeboat = 0;
@@ -927,7 +927,7 @@
 	hwread(vortex->mmio, VORTEX_FIFO_ADBCTRL + (fifo << 2));
 }
 
-void vortex_fifo_setwtctrl(vortex_t * vortex, int fifo, int b,
+static void vortex_fifo_setwtctrl(vortex_t * vortex, int fifo, int b,
 			   int priority, int empty, int valid, int f)
 {
 	int temp = 0;
@@ -950,11 +950,11 @@
 
 /* ADBDMA */
 
-void vortex_adbdma_init(vortex_t * vortex)
+static void vortex_adbdma_init(vortex_t * vortex)
 {
 }
 
-void vortex_adbdma_setupbuffer(vortex_t * vortex, int adbdma, int sb,
+static void vortex_adbdma_setupbuffer(vortex_t * vortex, int adbdma, int sb,
 			       u32 addr, u32 size, int sb_next, int c)
 {
 	// if "c" is 0, then DMA stops when reaching that buffer.
@@ -1003,7 +1003,7 @@
 		VORTEX_ADBDMA_BUFBASE + (((adbdma << 2) + sb) << 2), addr);
 }
 
-void vortex_adbdma_setfirstbuffer(vortex_t * vortex, int adbdma)
+static void vortex_adbdma_setfirstbuffer(vortex_t * vortex, int adbdma)
 {
 	stream_t *dma = &vortex->dma_adb[adbdma];
 
@@ -1011,7 +1011,7 @@
 		dma->dma_ctrl);
 }
 
-void vortex_adbdma_setstartbuffer(vortex_t * vortex, int adbdma, int sb)
+static void vortex_adbdma_setstartbuffer(vortex_t * vortex, int adbdma, int sb)
 {
 	stream_t *dma = &vortex->dma_adb[adbdma];
 	hwwrite(vortex->mmio, VORTEX_ADBDMA_START + (adbdma << 2),
@@ -1019,7 +1019,7 @@
 	dma->period_real = dma->period_virt = sb;
 }
 
-void vortex_adbdma_setbuffers(vortex_t * vortex, int adbdma,
+static void vortex_adbdma_setbuffers(vortex_t * vortex, int adbdma,
 			      unsigned int addr, int size, int count)
 {
 	stream_t *dma = &vortex->dma_adb[adbdma];
@@ -1076,7 +1076,7 @@
 	vortex_adbdma_setstartbuffer(vortex, adbdma, 0);
 }
 
-void vortex_adbdma_setmode(vortex_t * vortex, int adbdma, int ie, int dir,
+static void vortex_adbdma_setmode(vortex_t * vortex, int adbdma, int ie, int dir,
 			   int fmt, int d, unsigned long offset)
 {
 	stream_t *dma = &vortex->dma_adb[adbdma];
@@ -1098,7 +1098,7 @@
 	hwread(vortex->mmio, VORTEX_ADBDMA_CTRL + (adbdma << 2));
 }
 
-int vortex_adbdma_bufshift(vortex_t * vortex, int adbdma)
+static int vortex_adbdma_bufshift(vortex_t * vortex, int adbdma)
 {
 	stream_t *dma = &vortex->dma_adb[adbdma];
 	int page, p, pp, delta, i;
@@ -1147,13 +1147,13 @@
 	return delta;
 }
 
-void vortex_adbdma_setctrl(vortex_t * vortex, int a, int b, int c, int d,
+static void vortex_adbdma_setctrl(vortex_t * vortex, int a, int b, int c, int d,
 			   int e, int f)
 {
 	//FIXME
 }
-
-void vortex_adbdma_getposition(vortex_t * vortex, int adbdma, int *subbuf,
+#if 0
+static void vortex_adbdma_getposition(vortex_t * vortex, int adbdma, int *subbuf,
 			       int *pos)
 {
 	int temp, edi, eax, ecx, esp10, edx;
@@ -1267,14 +1267,14 @@
 	//this_84 = *pos;
 	//this_88 = *subbuf;
 }
-
-int vortex_adbdma_getcursubuffer(vortex_t * vortex, int adbdma)
+#endif
+static int vortex_adbdma_getcursubuffer(vortex_t * vortex, int adbdma)
 {
 	return ((hwread(vortex->mmio, VORTEX_ADBDMA_STAT + (adbdma << 2)) &
 		 ADB_SUBBUF_MASK) >> ADB_SUBBUF_SHIFT);
 }
 
-int inline vortex_adbdma_getlinearpos(vortex_t * vortex, int adbdma)
+static int inline vortex_adbdma_getlinearpos(vortex_t * vortex, int adbdma)
 {
 	stream_t *dma = &vortex->dma_adb[adbdma];
 	int temp;
@@ -1284,7 +1284,7 @@
 	return (temp);
 }
 
-void vortex_adbdma_startfifo(vortex_t * vortex, int adbdma)
+static void vortex_adbdma_startfifo(vortex_t * vortex, int adbdma)
 {
 	int this_8 = 0 /*empty */ , this_4 = 0 /*priority */ ;
 	stream_t *dma = &vortex->dma_adb[adbdma];
@@ -1311,7 +1311,7 @@
 	dma->fifo_status = FIFO_START;
 }
 
-void vortex_adbdma_resumefifo(vortex_t * vortex, int adbdma)
+static void vortex_adbdma_resumefifo(vortex_t * vortex, int adbdma)
 {
 	stream_t *dma = &vortex->dma_adb[adbdma];
 
@@ -1333,7 +1333,7 @@
 	dma->fifo_status = FIFO_START;
 }
 
-void vortex_adbdma_pausefifo(vortex_t * vortex, int adbdma)
+static void vortex_adbdma_pausefifo(vortex_t * vortex, int adbdma)
 {
 	stream_t *dma = &vortex->dma_adb[adbdma];
 
@@ -1353,7 +1353,7 @@
 	dma->fifo_status = FIFO_PAUSE;
 }
 
-void vortex_adbdma_stopfifo(vortex_t * vortex, int adbdma)
+static void vortex_adbdma_stopfifo(vortex_t * vortex, int adbdma)
 {
 	stream_t *dma = &vortex->dma_adb[adbdma];
 
@@ -1369,11 +1369,11 @@
 
 /* WTDMA */
 #ifndef CHIP_AU8810
-void vortex_wtdma_init(vortex_t * vortex)
+static void vortex_wtdma_init(vortex_t * vortex)
 {
 }
 
-void vortex_wtdma_setupbuffer(vortex_t * vortex, int wtdma, int sb,
+static void vortex_wtdma_setupbuffer(vortex_t * vortex, int wtdma, int sb,
 			      u32 addr, u32 size, int sb_next, int c)
 {
 	int offset, shift, mask;
@@ -1420,7 +1420,7 @@
 		VORTEX_WTDMA_BUFBASE + (((wtdma << 2) + sb) << 2), addr);
 }
 
-void vortex_wtdma_setfirstbuffer(vortex_t * vortex, int wtdma)
+static void vortex_wtdma_setfirstbuffer(vortex_t * vortex, int wtdma)
 {
 	//int this_7c=dma_ctrl;
 	stream_t *dma = &vortex->dma_wt[wtdma];
@@ -1429,7 +1429,7 @@
 		dma->dma_ctrl);
 }
 
-void vortex_wtdma_setstartbuffer(vortex_t * vortex, int wtdma, int sb)
+static void vortex_wtdma_setstartbuffer(vortex_t * vortex, int wtdma, int sb)
 {
 	stream_t *dma = &vortex->dma_wt[wtdma];
 	hwwrite(vortex->mmio, VORTEX_WTDMA_START + (wtdma << 2),
@@ -1437,7 +1437,7 @@
 	dma->period_real = dma->period_virt = sb;
 }
 
-void vortex_wtdma_setbuffers(vortex_t * vortex, int wtdma,
+static void vortex_wtdma_setbuffers(vortex_t * vortex, int wtdma,
 			     unsigned int addr, int size, int count)
 {
 	stream_t *dma = &vortex->dma_wt[wtdma];
@@ -1483,7 +1483,7 @@
 	vortex_wtdma_setstartbuffer(vortex, wtdma, 0);
 }
 
-void vortex_wtdma_setmode(vortex_t * vortex, int wtdma, int ie, int dir,
+static void vortex_wtdma_setmode(vortex_t * vortex, int wtdma, int ie, int dir,
 			  int fmt, int d, unsigned long offset)
 {
 	stream_t *dma = &vortex->dma_wt[wtdma];
@@ -1504,7 +1504,7 @@
 		dma->dma_ctrl);
 }
 
-int vortex_wtdma_bufshift(vortex_t * vortex, int wtdma)
+static int vortex_wtdma_bufshift(vortex_t * vortex, int wtdma)
 {
 	stream_t *dma = &vortex->dma_wt[wtdma];
 	int page, p, delta, i;
@@ -1540,7 +1540,7 @@
 	return delta;
 }
 
-void vortex_wtdma_getposition(vortex_t * vortex, int wtdma, int *subbuf,
+static void vortex_wtdma_getposition(vortex_t * vortex, int wtdma, int *subbuf,
 			      int *pos)
 {
 	int temp;
@@ -1549,13 +1549,13 @@
 	*pos = temp & POS_MASK;
 }
 
-int vortex_wtdma_getcursubuffer(vortex_t * vortex, int wtdma)
+static int vortex_wtdma_getcursubuffer(vortex_t * vortex, int wtdma)
 {
 	return ((hwread(vortex->mmio, VORTEX_ADBDMA_STAT + (wtdma << 2)) >>
 		 POS_SHIFT) & POS_MASK);
 }
 
-int inline vortex_wtdma_getlinearpos(vortex_t * vortex, int wtdma)
+static int inline vortex_wtdma_getlinearpos(vortex_t * vortex, int wtdma)
 {
 	stream_t *dma = &vortex->dma_wt[wtdma];
 	int temp;
@@ -1567,7 +1567,7 @@
 	return temp;
 }
 
-void vortex_wtdma_startfifo(vortex_t * vortex, int wtdma)
+static void vortex_wtdma_startfifo(vortex_t * vortex, int wtdma)
 {
 	stream_t *dma = &vortex->dma_wt[wtdma];
 	int this_8 = 0, this_4 = 0;
@@ -1594,7 +1594,7 @@
 	dma->fifo_status = FIFO_START;
 }
 
-void vortex_wtdma_resumefifo(vortex_t * vortex, int wtdma)
+static void vortex_wtdma_resumefifo(vortex_t * vortex, int wtdma)
 {
 	stream_t *dma = &vortex->dma_wt[wtdma];
 
@@ -1616,7 +1616,7 @@
 	dma->fifo_status = FIFO_START;
 }
 
-void vortex_wtdma_pausefifo(vortex_t * vortex, int wtdma)
+static void vortex_wtdma_pausefifo(vortex_t * vortex, int wtdma)
 {
 	stream_t *dma = &vortex->dma_wt[wtdma];
 
@@ -1636,7 +1636,7 @@
 	dma->fifo_status = FIFO_PAUSE;
 }
 
-void vortex_wtdma_stopfifo(vortex_t * vortex, int wtdma)
+static void vortex_wtdma_stopfifo(vortex_t * vortex, int wtdma)
 {
 	stream_t *dma = &vortex->dma_wt[wtdma];
 
@@ -1650,7 +1650,7 @@
 	dma->fifo_enabled = 0;
 }
 
-void vortex_wtdma_chain(vortex_t * vortex, int wtdma, char sb1, char sb0)
+static void vortex_wtdma_chain(vortex_t * vortex, int wtdma, char sb1, char sb0)
 {
 	stream_t *dma = &vortex->dma_wt[wtdma];
 	int *cfg;
@@ -1697,7 +1697,7 @@
 /* ADB */
 
 typedef int ADBRamLink;
-void vortex_adb_init(vortex_t * vortex)
+static void vortex_adb_init(vortex_t * vortex)
 {
 	int i;
 	/* it looks like we are writing more than we need to...
@@ -1715,19 +1715,19 @@
 	}
 }
 
-void vortex_adb_en_sr(vortex_t * vortex, int channel)
+static void vortex_adb_en_sr(vortex_t * vortex, int channel)
 {
 	hwwrite(vortex->mmio, VORTEX_ADB_SR,
 		hwread(vortex->mmio, VORTEX_ADB_SR) | (0x1 << channel));
 }
 
-void vortex_adb_dis_sr(vortex_t * vortex, int channel)
+static void vortex_adb_dis_sr(vortex_t * vortex, int channel)
 {
 	hwwrite(vortex->mmio, VORTEX_ADB_SR,
 		hwread(vortex->mmio, VORTEX_ADB_SR) & ~(0x1 << channel));
 }
 
-void vortex_adb_addroutes(vortex_t * vortex, unsigned char channel,
+static void vortex_adb_addroutes(vortex_t * vortex, unsigned char channel,
 			  ADBRamLink * route, int rnum)
 {
 	int temp, prev, lifeboat = 0;
@@ -1771,7 +1771,7 @@
 	hwwrite(vortex->mmio, VORTEX_ADB_RTBASE + (prev << 2), route[0]);
 }
 
-void vortex_adb_delroutes(vortex_t * vortex, unsigned char channel,
+static void vortex_adb_delroutes(vortex_t * vortex, unsigned char channel,
 			  ADBRamLink route0, ADBRamLink route1)
 {
 	int temp, lifeboat = 0, prev;
@@ -1809,7 +1809,7 @@
 	hwwrite(vortex->mmio, VORTEX_ADB_RTBASE + (prev << 2), temp);
 }
 
-void vortex_route(vortex_t * vortex, int en, unsigned char channel,
+static void vortex_route(vortex_t * vortex, int en, unsigned char channel,
 		  unsigned char source, unsigned char dest)
 {
 	ADBRamLink route;
@@ -1840,7 +1840,7 @@
 	}
 }
 
-void vortex_routes(vortex_t * vortex, int en, unsigned char channel,
+static void vortex_routes(vortex_t * vortex, int en, unsigned char channel,
 		   unsigned char source, unsigned char dest0,
 		   unsigned char dest1)
 {
@@ -1875,7 +1875,7 @@
 }
 
 /* Route two sources to same target. Sources must be of same class !!! */
-void vortex_routeLRT(vortex_t * vortex, int en, unsigned char ch,
+static void vortex_routeLRT(vortex_t * vortex, int en, unsigned char ch,
 		     unsigned char source0, unsigned char source1,
 		     unsigned char dest)
 {
@@ -1923,14 +1923,14 @@
 /* Connection stuff */
 
 // Connect adbdma to src('s).
-void vortex_connection_adbdma_src(vortex_t * vortex, int en,
+static void vortex_connection_adbdma_src(vortex_t * vortex, int en,
 				  unsigned char ch, unsigned char adbdma,
 				  unsigned char src)
 {
 	vortex_route(vortex, en, ch, ADB_DMA(adbdma), ADB_SRCIN(src));
 }
 
-void vortex_connection_adbdma_src_src(vortex_t * vortex, int en,
+static void vortex_connection_adbdma_src_src(vortex_t * vortex, int en,
 				      unsigned char channel,
 				      unsigned char adbdma,
 				      unsigned char src0,
@@ -1941,7 +1941,7 @@
 }
 
 // Connect SRC to mixin.
-void vortex_connection_src_mixin(vortex_t * vortex, int en,
+static void vortex_connection_src_mixin(vortex_t * vortex, int en,
 				 unsigned char channel, unsigned char src,
 				 unsigned char mixin)
 {
@@ -1950,7 +1950,7 @@
 }
 
 // Connect mixin with mix output.
-void vortex_connection_mixin_mix(vortex_t * vortex, int en,
+static void vortex_connection_mixin_mix(vortex_t * vortex, int en,
 				 unsigned char mixin, unsigned char mix,
 				 int a)
 {
@@ -1962,7 +1962,7 @@
 }
 
 // Connect absolut address to mixin.
-void vortex_connection_adb_mixin(vortex_t * vortex, int en,
+static void vortex_connection_adb_mixin(vortex_t * vortex, int en,
 				 unsigned char channel,
 				 unsigned char source, unsigned char mixin)
 {
@@ -1970,7 +1970,7 @@
 }
 
 // Connect two mix to AdbDma.
-void vortex_connection_mix_mix_adbdma(vortex_t * vortex, int en,
+static void vortex_connection_mix_mix_adbdma(vortex_t * vortex, int en,
 				      unsigned char ch, unsigned char mix0,
 				      unsigned char mix1,
 				      unsigned char adbdma)
@@ -1998,14 +1998,14 @@
 	}
 }
 
-void vortex_connection_src_adbdma(vortex_t * vortex, int en,
+static void vortex_connection_src_adbdma(vortex_t * vortex, int en,
 				  unsigned char ch, unsigned char src,
 				  unsigned char adbdma)
 {
 	vortex_route(vortex, en, ch, ADB_SRCOUT(src), ADB_DMA(adbdma));
 }
 
-void vortex_connection_src_src_adbdma(vortex_t * vortex, int en,
+static void vortex_connection_src_src_adbdma(vortex_t * vortex, int en,
 				      unsigned char ch, unsigned char src0,
 				      unsigned char src1,
 				      unsigned char adbdma)
@@ -2016,7 +2016,7 @@
 }
 
 // mix to absolut address.
-void vortex_connection_mix_adb(vortex_t * vortex, int en, unsigned char ch,
+static void vortex_connection_mix_adb(vortex_t * vortex, int en, unsigned char ch,
 			       unsigned char mix, unsigned char dest)
 {
 	vortex_route(vortex, en, ch, ADB_MIXOUT(mix), dest);
@@ -2024,7 +2024,7 @@
 }
 
 // mixer to src.
-void vortex_connection_mix_src(vortex_t * vortex, int en, unsigned char ch,
+static void vortex_connection_mix_src(vortex_t * vortex, int en, unsigned char ch,
 			       unsigned char mix, unsigned char src)
 {
 	vortex_route(vortex, en, ch, ADB_MIXOUT(mix), ADB_SRCIN(src));
@@ -2032,7 +2032,7 @@
 }
 
 /* CODEC connect. */
-void vortex_connect_codecplay(vortex_t * vortex, int en,
+static void vortex_connect_codecplay(vortex_t * vortex, int en,
 			      unsigned char mixers[])
 {
 #ifdef CHIP_AU8820
@@ -2068,7 +2068,7 @@
 #endif
 }
 
-void vortex_connect_codecrec(vortex_t * vortex, int en,
+static void vortex_connect_codecrec(vortex_t * vortex, int en,
 			     unsigned char mixin0, unsigned char mixin1)
 {
 	/*
@@ -2095,7 +2095,7 @@
  out: Mean checkout if != 0. Else mean Checkin resource.
  restype: Indicates type of resource to be checked in or out.
 */
-int vortex_adb_checkinout(vortex_t * vortex, int resmap[], int out,
+static int vortex_adb_checkinout(vortex_t * vortex, int resmap[], int out,
 			  int restype)
 {
 	int i, qty = resnum[restype], resinuse = 0;
@@ -2140,7 +2140,7 @@
 }
 
 /* Default Connections  */
-void vortex_connect_default(vortex_t * vortex, int en)
+static void vortex_connect_default(vortex_t * vortex, int en)
 {
 
 	// FIXME: check if checkout was succesful.
@@ -2205,7 +2205,7 @@
   type: Type of audio output/source (codec, spdif, i2s, dsp, etc)
   Return: Return allocated DMA or same DMA passed as "dma" when dma >= 0.
 */
-int vortex_adb_allocroute(vortex_t * vortex, int dma, int nr_ch, int dir,
+static int vortex_adb_allocroute(vortex_t * vortex, int dma, int nr_ch, int dir,
 			  int type)
 {
 	stream_t *stream;
@@ -2453,7 +2453,7 @@
 /*
  Set the SampleRate of the SRC's attached to the given DMA engine.
  */
-void vortex_adb_setsrc(vortex_t * vortex, int adbdma, unsigned int rate,
+static void vortex_adb_setsrc(vortex_t * vortex, int adbdma, unsigned int rate,
 		       int dir)
 {
 	stream_t *stream = &(vortex->dma_adb[adbdma]);
@@ -2475,25 +2475,25 @@
 
 // Timer and ISR functions.
 
-void vortex_settimer(vortex_t * vortex, int period)
+static void vortex_settimer(vortex_t * vortex, int period)
 {
 	//set the timer period to <period> 48000ths of a second.
 	hwwrite(vortex->mmio, VORTEX_IRQ_STAT, period);
 }
 
-void vortex_enable_timer_int(vortex_t * card)
+static void vortex_enable_timer_int(vortex_t * card)
 {
 	hwwrite(card->mmio, VORTEX_IRQ_CTRL,
 		hwread(card->mmio, VORTEX_IRQ_CTRL) | IRQ_TIMER | 0x60);
 }
 
-void vortex_disable_timer_int(vortex_t * card)
+static void vortex_disable_timer_int(vortex_t * card)
 {
 	hwwrite(card->mmio, VORTEX_IRQ_CTRL,
 		hwread(card->mmio, VORTEX_IRQ_CTRL) & ~IRQ_TIMER);
 }
 
-void vortex_enable_int(vortex_t * card)
+static void vortex_enable_int(vortex_t * card)
 {
 	// CAsp4ISR__EnableVortexInt_void_
 	hwwrite(card->mmio, VORTEX_CTRL,
@@ -2502,13 +2502,13 @@
 		(hwread(card->mmio, VORTEX_IRQ_CTRL) & 0xffffefc0) | 0x24);
 }
 
-void vortex_disable_int(vortex_t * card)
+static void vortex_disable_int(vortex_t * card)
 {
 	hwwrite(card->mmio, VORTEX_CTRL,
 		hwread(card->mmio, VORTEX_CTRL) & ~CTRL_IRQ_ENABLE);
 }
 
-irqreturn_t vortex_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t vortex_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
 	vortex_t *vortex =
 	    snd_magic_cast(vortex_t, dev_id, return IRQ_NONE);
@@ -2595,7 +2595,7 @@
 /* Codec */
 
 #define POLL_COUNT 1000
-void vortex_codec_init(vortex_t * vortex)
+static void vortex_codec_init(vortex_t * vortex)
 {
 	int i;
 
@@ -2632,7 +2632,7 @@
 		hwread(vortex->mmio, VORTEX_CODEC_EN) | EN_CODEC);
 }
 
-void vortex_codec_write(ac97_t * codec, unsigned short addr,
+static void vortex_codec_write(ac97_t * codec, unsigned short addr,
 			unsigned short data)
 {
 
@@ -2662,7 +2662,7 @@
 	spin_unlock_irqrestore(&card->lock, flags);
 }
 
-unsigned short vortex_codec_read(ac97_t * codec, unsigned short addr)
+static unsigned short vortex_codec_read(ac97_t * codec, unsigned short addr)
 {
 
 	vortex_t *card = (vortex_t *) codec->private_data;
@@ -2708,7 +2708,7 @@
 }
 
 /* SPDIF support  */
-void vortex_spdif_init(vortex_t * vortex, int spdif_sr, int spdif_mode)
+static void vortex_spdif_init(vortex_t * vortex, int spdif_sr, int spdif_mode)
 {
 	int i, this_38 = 0, this_04 = 0, this_08 = 0, this_0c = 0;
 
@@ -2786,7 +2786,7 @@
 
 /* Initialization */
 
-int vortex_core_init(vortex_t * vortex)
+static int vortex_core_init(vortex_t * vortex)
 {
 
 	printk(KERN_INFO "Vortex: hardware init.... ");
@@ -2838,7 +2838,7 @@
 	return 0;
 }
 
-int vortex_core_shutdown(vortex_t * vortex)
+static int vortex_core_shutdown(vortex_t * vortex)
 {
 
 	printk(KERN_INFO "Vortex: hardware shutdown...");
@@ -2868,7 +2868,7 @@
 
 /* Alsa support. */
 
-int vortex_alsafmt_aspfmt(int alsafmt)
+static int vortex_alsafmt_aspfmt(int alsafmt)
 {
 	int fmt;
 
@@ -2911,7 +2911,7 @@
 	ASPFMTSPDIF,		/* ? */
 } ASPENCODING;
 
-int vortex_translateformat(vortex_t * vortex, char bits, char nch,
+static int vortex_translateformat(vortex_t * vortex, char bits, char nch,
 			   int encod)
 {
 	int a, this_194;
@@ -2952,7 +2952,7 @@
 	return (a);
 }
 
-void vortex_cdmacore_setformat(vortex_t * vortex, int bits, int nch)
+static void vortex_cdmacore_setformat(vortex_t * vortex, int bits, int nch)
 {
 	short int d, this_148;
 
diff -uN old/au88x0_eq.c new/au88x0_eq.c
--- old/au88x0_eq.c	2004-02-03 13:15:21.000000000 -0500
+++ new/au88x0_eq.c	2004-02-03 17:41:38.000000000 -0500
@@ -33,19 +33,19 @@
 #include "au88x0_eqdata.c"
 
 /* CEqHw.s */
-void vortex_EqHw_SetTimeConsts(vortex_t * vortex, u16 a, u16 b)
+static void vortex_EqHw_SetTimeConsts(vortex_t * vortex, u16 a, u16 b)
 {
 	hwwrite(vortex->mmio, 0x2b3c4, a);
 	hwwrite(vortex->mmio, 0x2b3c8, b);
 }
-
-void vortex_EqHw_GetTimeConsts(vortex_t * vortex, u16 * a, u16 * b)
+#if 0
+static void vortex_EqHw_GetTimeConsts(vortex_t * vortex, u16 * a, u16 * b)
 {
 	*a = hwread(vortex->mmio, 0x2b3c4);
 	*b = hwread(vortex->mmio, 0x2b3c8);
 }
-
-void vortex_EqHw_SetLeftCoefs(vortex_t * vortex, u16 a[])
+#endif
+static void vortex_EqHw_SetLeftCoefs(vortex_t * vortex, u16 a[])
 {
 	eqhw_t *eqhw = &(vortex->eq.this04);
 	int eax, i = 0, n /*esp2c */  = 0;
@@ -87,14 +87,14 @@
 		i += 5;
 	} while (n < eqhw->this04);
 }
-
-void vortex_EqHw_GetLeftCoefs(vortex_t * vortex, u16 a[])
+#if 0
+static void vortex_EqHw_GetLeftCoefs(vortex_t * vortex, u16 a[])
 {
 
 
 }
-
-void vortex_EqHw_SetRightCoefs(vortex_t * vortex, u16 a[])
+#endif
+static void vortex_EqHw_SetRightCoefs(vortex_t * vortex, u16 a[])
 {
 	eqhw_t *eqhw = &(vortex->eq.this04);
 	int i = 0, n /*esp2c */  = 0, eax;
@@ -136,14 +136,14 @@
 	} while (n < eqhw->this04);
 
 }
-
-void vortex_EqHw_GetRightCoefs(vortex_t * vortex, u16 a[])
+#if 0
+static void vortex_EqHw_GetRightCoefs(vortex_t * vortex, u16 a[])
 {
 
 
 }
-
-void vortex_EqHw_SetLeftStates(vortex_t * vortex, u16 a[], u16 b[])
+#endif
+static void vortex_EqHw_SetLeftStates(vortex_t * vortex, u16 a[], u16 b[])
 {
 	eqhw_t *eqhw = &(vortex->eq.this04);
 	int i = 0, ebx = 0;
@@ -163,13 +163,13 @@
 		ebx++;
 	} while (eqhw->this04 > ebx);
 }
-
-void vortex_EqHw_GetLeftStates(vortex_t * vortex, u16 * a, u16 b[])
+#if 0
+static void vortex_EqHw_GetLeftStates(vortex_t * vortex, u16 * a, u16 b[])
 {
 
 
 }
-
+#endif
 void vortex_EqHw_SetRightStates(vortex_t * vortex, u16 a[], u16 b[])
 {
 	eqhw_t *eqhw = &(vortex->eq.this04);
@@ -190,13 +190,13 @@
 		ebx++;
 	} while (ebx < eqhw->this04);
 }
-
+#if 0
 void vortex_EqHw_GetRightStates(vortex_t * vortex, u16 * a, u16 b[])
 {
 
 }
-
-void vortex_EqHw_SetBypassGain(vortex_t * vortex, u16 a, u16 b)
+#endif
+static void vortex_EqHw_SetBypassGain(vortex_t * vortex, u16 a, u16 b)
 {
 	eqhw_t *eqhw = &(vortex->eq.this04);
 	int eax;
@@ -218,40 +218,40 @@
 	}
 }
 
-void vortex_EqHw_SetA3DBypassGain(vortex_t * vortex, u16 a, u16 b)
+static void vortex_EqHw_SetA3DBypassGain(vortex_t * vortex, u16 a, u16 b)
 {
 
 	hwwrite(vortex->mmio, 0x2b3e0, a);
 	hwwrite(vortex->mmio, 0x2b3f8, b);
 }
-
-void vortex_EqHw_SetCurrBypassGain(vortex_t * vortex, u16 a, u16 b)
+#if 0
+static void vortex_EqHw_SetCurrBypassGain(vortex_t * vortex, u16 a, u16 b)
 {
 
 	hwwrite(vortex->mmio, 0x2b3d0, a);
 	hwwrite(vortex->mmio, 0x2b3e8, b);
 }
 
-void vortex_EqHw_SetCurrA3DBypassGain(vortex_t * vortex, u16 a, u16 b)
+static void vortex_EqHw_SetCurrA3DBypassGain(vortex_t * vortex, u16 a, u16 b)
 {
 
 	hwwrite(vortex->mmio, 0x2b3dc, a);
 	hwwrite(vortex->mmio, 0x2b3f4, b);
 }
-
-void vortex_EqHw_SetLeftGainsSingleTarget(vortex_t * vortex, u16 index,
+#endif
+static void vortex_EqHw_SetLeftGainsSingleTarget(vortex_t * vortex, u16 index,
 					  u16 b)
 {
 	hwwrite(vortex->mmio, 0x2b02c + (index * 0x30), b);
 }
 
-void vortex_EqHw_SetRightGainsSingleTarget(vortex_t * vortex, u16 index,
+static void vortex_EqHw_SetRightGainsSingleTarget(vortex_t * vortex, u16 index,
 					   u16 b)
 {
 	hwwrite(vortex->mmio, 0x2b20c + (index * 0x30), b);
 }
 
-void vortex_EqHw_SetLeftGainsTarget(vortex_t * vortex, u16 a[])
+static void vortex_EqHw_SetLeftGainsTarget(vortex_t * vortex, u16 a[])
 {
 	eqhw_t *eqhw = &(vortex->eq.this04);
 	int ebx = 0;
@@ -264,7 +264,7 @@
 	} while (ebx < eqhw->this04);
 }
 
-void vortex_EqHw_SetRightGainsTarget(vortex_t * vortex, u16 a[])
+static void vortex_EqHw_SetRightGainsTarget(vortex_t * vortex, u16 a[])
 {
 	eqhw_t *eqhw = &(vortex->eq.this04);
 	int ebx = 0;
@@ -277,8 +277,8 @@
 		ebx++;
 	} while (ebx < eqhw->this04);
 }
-
-void vortex_EqHw_GetLeftGainsTarget(vortex_t * vortex, u16 a[])
+#if 0
+static void vortex_EqHw_GetLeftGainsTarget(vortex_t * vortex, u16 a[])
 {
 	eqhw_t *eqhw = &(vortex->eq.this04);
 	int ebx = 0;
@@ -292,7 +292,7 @@
 	} while (ebx < eqhw->this04);
 }
 
-void vortex_EqHw_GetRightGainsTarget(vortex_t * vortex, u16 a[])
+static void vortex_EqHw_GetRightGainsTarget(vortex_t * vortex, u16 a[])
 {
 	eqhw_t *eqhw = &(vortex->eq.this04);
 	int ebx = 0;
@@ -305,8 +305,8 @@
 		ebx++;
 	} while (ebx < eqhw->this04);
 }
-
-void vortex_EqHw_SetLeftGainsCurrent(vortex_t * vortex, u16 a[])
+#endif
+static void vortex_EqHw_SetLeftGainsCurrent(vortex_t * vortex, u16 a[])
 {
 	eqhw_t *eqhw = &(vortex->eq.this04);
 	int ebx = 0;
@@ -320,7 +320,7 @@
 	} while (ebx < eqhw->this04);
 }
 
-void vortex_EqHw_SetRightGainsCurrent(vortex_t * vortex, u16 a[])
+static void vortex_EqHw_SetRightGainsCurrent(vortex_t * vortex, u16 a[])
 {
 	eqhw_t *eqhw = &(vortex->eq.this04);
 	int ebx = 0;
@@ -333,8 +333,8 @@
 		ebx++;
 	} while (ebx < eqhw->this04);
 }
-
-void vortex_EqHw_GetLeftGainsCurrent(vortex_t * vortex, u16 a[])
+#if 0
+static void vortex_EqHw_GetLeftGainsCurrent(vortex_t * vortex, u16 a[])
 {
 	eqhw_t *eqhw = &(vortex->eq.this04);
 	int ebx = 0;
@@ -348,7 +348,7 @@
 	} while (ebx < eqhw->this04);
 }
 
-void vortex_EqHw_GetRightGainsCurrent(vortex_t * vortex, u16 a[])
+static void vortex_EqHw_GetRightGainsCurrent(vortex_t * vortex, u16 a[])
 {
 	eqhw_t *eqhw = &(vortex->eq.this04);
 	int ebx = 0;
@@ -361,8 +361,8 @@
 		ebx++;
 	} while (ebx < eqhw->this04);
 }
-
-void vortex_EqHw_SetLevels(vortex_t * vortex, u16 a[])
+#endif
+static void vortex_EqHw_SetLevels(vortex_t * vortex, u16 a[])
 {
 	eqhw_t *eqhw = &(vortex->eq.this04);
 	int ebx;
@@ -390,7 +390,7 @@
 	hwwrite(vortex->mmio, 0x2b3f0, a[3 + (eqhw->this04 * 2)]);
 }
 
-void vortex_EqHw_GetLevels(vortex_t * vortex, u16 a[])
+static void vortex_EqHw_GetLevels(vortex_t * vortex, u16 a[])
 {
 	eqhw_t *eqhw = &(vortex->eq.this04);
 	int ebx;
@@ -418,38 +418,38 @@
 	a[3 + (eqhw->this04 * 2)] = hwread(vortex->mmio, 0x2b3f0);
 }
 
-void vortex_EqHw_SetControlReg(vortex_t * vortex, unsigned long reg)
+static void vortex_EqHw_SetControlReg(vortex_t * vortex, unsigned long reg)
 {
 	hwwrite(vortex->mmio, 0x2b440, reg);
 }
 
-void vortex_EqHw_GetControlReg(vortex_t * vortex, unsigned long *reg)
+static void vortex_EqHw_GetControlReg(vortex_t * vortex, unsigned long *reg)
 {
 	*reg = hwread(vortex->mmio, 0x2b440);
 }
 
-void vortex_EqHw_SetSampleRate(vortex_t * vortex, int sr)
+static void vortex_EqHw_SetSampleRate(vortex_t * vortex, int sr)
 {
 	hwwrite(vortex->mmio, 0x2b440, ((sr & 0x1f) << 3) | 0xb800);
 }
 
-void vortex_EqHw_GetSampleRate(vortex_t * vortex, int *sr)
+static void vortex_EqHw_GetSampleRate(vortex_t * vortex, int *sr)
 {
 	*sr = (hwread(vortex->mmio, 0x2b440) >> 3) & 0x1f;
 }
 
-void vortex_EqHw_Enable(vortex_t * vortex)
+static void vortex_EqHw_Enable(vortex_t * vortex)
 {
 	hwwrite(vortex->mmio, 0x2b440, 0xf001);
 }
 
-void vortex_EqHw_Disable(vortex_t * vortex)
+static void vortex_EqHw_Disable(vortex_t * vortex)
 {
 	hwwrite(vortex->mmio, 0x2b440, 0xf000);
 }
 
 /* Reset (zero) buffers */
-void vortex_EqHw_ZeroIO(vortex_t * vortex)
+static void vortex_EqHw_ZeroIO(vortex_t * vortex)
 {
 	int i;
 	for (i = 0; i < 0x8; i++)
@@ -458,14 +458,14 @@
 		hwwrite(vortex->mmio, 0x2b430 + (i << 2), 0x0);
 }
 
-void vortex_EqHw_ZeroA3DIO(vortex_t * vortex)
+static void vortex_EqHw_ZeroA3DIO(vortex_t * vortex)
 {
 	int i;
 	for (i = 0; i < 0x4; i++)
 		hwwrite(vortex->mmio, 0x2b410 + (i << 2), 0x0);
 }
 
-void vortex_EqHw_ZeroState(vortex_t * vortex)
+static void vortex_EqHw_ZeroState(vortex_t * vortex)
 {
 
 	vortex_EqHw_SetControlReg(vortex, 0);
@@ -492,7 +492,7 @@
 }
 
 /* Program coeficients as pass through */
-void vortex_EqHw_ProgramPipe(vortex_t * vortex)
+static void vortex_EqHw_ProgramPipe(vortex_t * vortex)
 {
 	vortex_EqHw_SetTimeConsts(vortex, 0, 0);
 
@@ -506,7 +506,7 @@
 }
 
 /* Program EQ block as 10 band Equalizer */
-void vortex_EqHw_Program10Band(vortex_t * vortex,
+static void vortex_EqHw_Program10Band(vortex_t * vortex,
 			       auxxEqCoeffSet_t * coefset)
 {
 
@@ -524,7 +524,7 @@
 }
 
 
-void vortex_EqHw_GetTenBandLevels(vortex_t * vortex, u16 peaks[])
+static void vortex_EqHw_GetTenBandLevels(vortex_t * vortex, u16 peaks[])
 {
 	eqhw_t *eqhw = &(vortex->eq.this04);
 	int i;
@@ -541,7 +541,7 @@
 
 /* CEqlzr.s */
 
-int vortex_Eqlzr_GetLeftGain(vortex_t * vortex, u16 index, u16 * gain)
+static int vortex_Eqlzr_GetLeftGain(vortex_t * vortex, u16 index, u16 * gain)
 {
 	eqlzr_t *eq = &(vortex->eq);
 
@@ -552,7 +552,7 @@
 	return 1;
 }
 
-void vortex_Eqlzr_SetLeftGain(vortex_t * vortex, u16 index, u16 gain)
+static void vortex_Eqlzr_SetLeftGain(vortex_t * vortex, u16 index, u16 gain)
 {
 	eqlzr_t *eq = &(vortex->eq);
 
@@ -566,7 +566,7 @@
 	vortex_EqHw_SetLeftGainsSingleTarget(vortex, index, gain);
 }
 
-int vortex_Eqlzr_GetRightGain(vortex_t * vortex, u16 index, u16 * gain)
+static int vortex_Eqlzr_GetRightGain(vortex_t * vortex, u16 index, u16 * gain)
 {
 	eqlzr_t *eq = &(vortex->eq);
 
@@ -577,7 +577,7 @@
 	return 1;
 }
 
-void vortex_Eqlzr_SetRightGain(vortex_t * vortex, u16 index, u16 gain)
+static void vortex_Eqlzr_SetRightGain(vortex_t * vortex, u16 index, u16 gain)
 {
 	eqlzr_t *eq = &(vortex->eq);
 
@@ -591,7 +591,7 @@
 	vortex_EqHw_SetRightGainsSingleTarget(vortex, index, gain);
 }
 
-int vortex_Eqlzr_GetAllBands(vortex_t * vortex, u16 * gains,
+static int vortex_Eqlzr_GetAllBands(vortex_t * vortex, u16 * gains,
 			     unsigned long *cnt)
 {
 	eqlzr_t *eq = &(vortex->eq);
@@ -613,7 +613,7 @@
 	return 0;
 }
 
-int vortex_Eqlzr_SetAllBandsFromActiveCoeffSet(vortex_t * vortex)
+static int vortex_Eqlzr_SetAllBandsFromActiveCoeffSet(vortex_t * vortex)
 {
 	eqlzr_t *eq = &(vortex->eq);
 
@@ -624,7 +624,7 @@
 	return 0;
 }
 
-int vortex_Eqlzr_SetAllBands(vortex_t * vortex, u16 gains[],
+static int vortex_Eqlzr_SetAllBands(vortex_t * vortex, u16 gains[],
 			     unsigned long count)
 {
 	eqlzr_t *eq = &(vortex->eq);
@@ -643,7 +643,7 @@
 	return vortex_Eqlzr_SetAllBandsFromActiveCoeffSet(vortex);
 }
 
-void vortex_Eqlzr_ProgramA3dBypassGain(vortex_t * vortex)
+static void vortex_Eqlzr_ProgramA3dBypassGain(vortex_t * vortex)
 {
 	eqlzr_t *eq = &(vortex->eq);
 	int eax, ebx;
@@ -657,7 +657,7 @@
 	vortex_EqHw_SetA3DBypassGain(vortex, ebx, eax);
 }
 
-void vortex_Eqlzr_SetBypass(vortex_t * vortex, long bp)
+static void vortex_Eqlzr_SetBypass(vortex_t * vortex, long bp)
 {
 	eqlzr_t *eq = &(vortex->eq);
 
@@ -675,7 +675,7 @@
 	vortex_Eqlzr_ProgramA3dBypassGain(vortex);
 }
 
-void vortex_Eqlzr_ReadAndSetActiveCoefSet(vortex_t * vortex)
+static void vortex_Eqlzr_ReadAndSetActiveCoefSet(vortex_t * vortex)
 {
 	eqlzr_t *eq = &(vortex->eq);
 
@@ -686,8 +686,8 @@
 }
 
 #if 0
-void vortex_Eqlzr_vortex_SetA3dBypassVolume()
-void vortex_Eqlzr_ShutDownA3d()
+static void vortex_Eqlzr_vortex_SetA3dBypassVolume()
+static void vortex_Eqlzr_ShutDownA3d()
 #endif
  int vortex_Eqlzr_GetAllPeaks(vortex_t * vortex, u16 * peaks, int *count)
 {
@@ -700,14 +700,14 @@
 	return 0;
 }
 
-auxxEqCoeffSet_t *vortex_Eqlzr_GetActiveCoefSet(vortex_t * vortex)
+static auxxEqCoeffSet_t *vortex_Eqlzr_GetActiveCoefSet(vortex_t * vortex)
 {
 	eqlzr_t *eq = &(vortex->eq);
 
 	return (&(eq->coefset));
 }
 
-void vortex_Eqlzr_init(vortex_t * vortex)
+static void vortex_Eqlzr_init(vortex_t * vortex)
 {
 	eqlzr_t *eq = &(vortex->eq);
 
@@ -898,7 +898,7 @@
 };
 
 /* ALSA driver entry points. Init and exit. */
-int vortex_eq_init(vortex_t * vortex)
+static int vortex_eq_init(vortex_t * vortex)
 {
 	snd_kcontrol_t *kcontrol;
 	int err, i;
@@ -933,7 +933,7 @@
 	return 0;
 }
 
-int vortex_eq_free(vortex_t * vortex)
+static int vortex_eq_free(vortex_t * vortex)
 {
 	/*
 	   //FIXME: segfault because vortex->eqctrl[i] == 4
diff -uN old/au88x0_mixer.c new/au88x0_mixer.c
--- old/au88x0_mixer.c	2004-02-03 13:15:21.000000000 -0500
+++ new/au88x0_mixer.c	2004-02-03 17:41:38.000000000 -0500
@@ -28,7 +28,7 @@
 #include <sound/core.h>
 #include "au88x0.h"
 
-int __devinit snd_vortex_mixer(vortex_t * vortex)
+static int __devinit snd_vortex_mixer(vortex_t * vortex)
 {
 	ac97_bus_t bus, *pbus;
 	ac97_t ac97;
diff -uN old/au88x0_mpu401.c new/au88x0_mpu401.c
--- old/au88x0_mpu401.c	2004-02-03 13:15:21.000000000 -0500
+++ new/au88x0_mpu401.c	2004-02-03 17:41:38.000000000 -0500
@@ -42,7 +42,7 @@
 #define MPU401_ENTER_UART	0x3f
 #define MPU401_ACK			0xfe
 
-int __devinit snd_vortex_midi(vortex_t * vortex)
+static int __devinit snd_vortex_midi(vortex_t * vortex)
 {
 	snd_rawmidi_t *rmidi;
 	int temp, mode;
diff -uN old/au88x0_pcm.c new/au88x0_pcm.c
--- old/au88x0_pcm.c	2004-02-03 13:15:21.000000000 -0500
+++ new/au88x0_pcm.c	2004-02-03 17:41:38.000000000 -0500
@@ -446,7 +446,7 @@
 };
 
 /* create a pcm device */
-int __devinit snd_vortex_new_pcm(vortex_t * chip, int idx, int nr)
+static int __devinit snd_vortex_new_pcm(vortex_t * chip, int idx, int nr)
 {
 	snd_pcm_t *pcm;
 	int err, nr_capt;
diff -uN old/Makefile new/Makefile
--- old/Makefile	2004-02-03 13:15:21.000000000 -0500
+++ new/Makefile	2004-02-03 17:41:38.000000000 -0500
@@ -5,9 +5,9 @@
 include $(SND_TOPDIR)/toplevel.config
 include $(SND_TOPDIR)/Makefile.conf
 
-snd-au8810-objs := au8810.o au8810_core.o au8810_pcm.o au8810_mixer.o au8810_mpu401.o au8810_game.o au8810_eq.o
-snd-au8820-objs := au8820.o au8820_core.o au8820_pcm.o au8820_mixer.o au8820_mpu401.o au8820_game.o au8820_synth.o
-snd-au8830-objs := au8830.o au8830_core.o au8830_pcm.o au8830_mixer.o au8830_mpu401.o au8830_game.o au8830_eq.o au8830_synth.o
+snd-au8810-objs := au8810.o
+snd-au8820-objs := au8820.o
+snd-au8830-objs := au8830.o
 
 obj-$(CONFIG_SND_AU8810) += snd-au8810.o
 obj-$(CONFIG_SND_AU8820) += snd-au8820.o
Common subdirectories: old/test and new/test