ALSA CVS update - Jaroslav Kysela <perex@suse.cz>

au88x0 driver
Fixed gameport dependency and solid kernel build

diff --git a/sound/pci/au88x0/au88x0_a3d.c b/sound/pci/au88x0/au88x0_a3d.c
index f3399b30dd91cdbabbc28cd27c3d73fa06a8d6aa..2ca3051102524056b71f0471572570a142749fd6 100644 (file)
--- a/sound/pci/au88x0/au88x0_a3d.c
+++ b/sound/pci/au88x0/au88x0_a3d.c
@@ -562,7 +562,7 @@ static void vortex_A3dSourceHw_Initialize(vortex_t * v, int source, int slice)
        a3dsrc_SetA3DSampleRate(a3dsrc, 0x11);
 }
 
-int Vort3DRend_Initialize(vortex_t * v, unsigned short mode)
+static int Vort3DRend_Initialize(vortex_t * v, unsigned short mode)
 {
        v->xt_mode = mode;      /* this_14 */
 

diff --git a/sound/pci/au88x0/au88x0_game.c b/sound/pci/au88x0/au88x0_game.c
index 5c00a46768de93a336fff4a43ee72ba6230ad8a4..7e7443d3b2b576f8920e5afaaca63a61652e0806 100644 (file)
--- a/sound/pci/au88x0/au88x0_game.c
+++ b/sound/pci/au88x0/au88x0_game.c
@@ -37,6 +37,8 @@
 #include "au88x0.h"
 #include <linux/gameport.h>
 
+#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE))
+
 #define VORTEX_GAME_DWAIT      20      /* 20 ms */
 
 static struct gameport gameport;
@@ -119,3 +121,10 @@ static int vortex_gameport_unregister(vortex_t * vortex)
                gameport_unregister_port(vortex->gameport);
        return 0;
 }
+
+#else
+
+static inline int vortex_gameport_register(vortex_t * vortex) { return 0; }
+static inline int vortex_gameport_unregister(vortex_t * vortex) { return 0; }
+
+#endif