Commit 909ab438 authored by Jaroslav Kysela's avatar Jaroslav Kysela

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

au88x0 driver
Fixed gameport dependency and solid kernel build
parent f53f044b
...@@ -562,7 +562,7 @@ static void vortex_A3dSourceHw_Initialize(vortex_t * v, int source, int slice) ...@@ -562,7 +562,7 @@ static void vortex_A3dSourceHw_Initialize(vortex_t * v, int source, int slice)
a3dsrc_SetA3DSampleRate(a3dsrc, 0x11); 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 */ v->xt_mode = mode; /* this_14 */
......
...@@ -37,6 +37,8 @@ ...@@ -37,6 +37,8 @@
#include "au88x0.h" #include "au88x0.h"
#include <linux/gameport.h> #include <linux/gameport.h>
#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE))
#define VORTEX_GAME_DWAIT 20 /* 20 ms */ #define VORTEX_GAME_DWAIT 20 /* 20 ms */
static struct gameport gameport; static struct gameport gameport;
...@@ -119,3 +121,10 @@ static int vortex_gameport_unregister(vortex_t * vortex) ...@@ -119,3 +121,10 @@ static int vortex_gameport_unregister(vortex_t * vortex)
gameport_unregister_port(vortex->gameport); gameport_unregister_port(vortex->gameport);
return 0; 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
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment