ALSA CVS update

au88x0 driver
- asXtalkGainsAllChan -> vortex_asXtalkGainsAllChan
- fixed extern/static problem
Signed-off-by: Jaroslav Kysela <perex@suse.cz>

sound/pci/au88x0/au88x0_a3d.c

@@ -567,7 +567,7 @@ static int Vort3DRend_Initialize(vortex_t * v, unsigned short mode)
 	v->xt_mode = mode;	/* this_14 */
 
 	vortex_XtalkHw_init(v);
-	vortex_XtalkHw_SetGains(v, asXtalkGainsAllChan);
+	vortex_XtalkHw_SetGains(v, vortex_asXtalkGainsAllChan);
 	switch (v->xt_mode) {
 	case XT_SPEAKER0:
 		vortex_XtalkHw_ProgramXtalkNarrow(v);

sound/pci/au88x0/au88x0_xtalk.c

@@ -61,7 +61,7 @@ static xtalk_gains_t const asXtalkGains1Chan = {
 };
 
 // Input gain for 4 A3D slices. One possible input pair is left zero.
-static xtalk_gains_t const asXtalkGainsAllChan = {
+xtalk_gains_t const vortex_asXtalkGainsAllChan = {
 	0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF, 0, 0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF,
 	0
 	    //0x7FFF,0x7FFF,0x7FFF,0x7FFF,0x7fff,0x7FFF,0x7FFF,0x7FFF,0x7FFF,0x7fff

sound/pci/au88x0/au88x0_xtalk.h

@@ -45,7 +45,7 @@ typedef short xtalk_instate_t[XTINST_SZ];
 typedef short xtalk_coefs_t[5][5];
 typedef short xtalk_state_t[5][4];
 
-extern xtalk_gains_t const asXtalkGainsAllChan;
+extern xtalk_gains_t const vortex_asXtalkGainsAllChan;
 
 static void vortex_XtalkHw_SetGains(vortex_t * vortex,
 				    xtalk_gains_t const gains);