m68k: compile fixes for dmasound (static vs. extern)

PATCH In review Al Viro 1 participant 1 message Dec 22, 2005 Sound

lore

Share & tools

lore

Al Viro

author

2005-12-22 04:56 UTC #0 lore raw

PATCH 20/36 m68k: compile fixes for dmasound (static vs. extern)

From: Al Viro <[email protected]>
Date: 1133440636 -0500

sound/oss/dmasound/dmasound_atari.c has static expand_bal sound/oss/dmasound/dmasound_q40.c has static expand_bal sound/oss/dmasound/dmasound_awacs.c has non-static expand_bal sound/oss/dmasound/trans_16.c uses expand_bal from dmasound_awacs.c all 4 include dmasound.h; extern for expand_bal used to be there, which is a bloody bad idea, considering _atari and _q40. Moved the extern to trans_16.c.

Signed-off-by Al Viro <[email protected]>

---

 sound/oss/dmasound/dmasound.h |    1 -
 sound/oss/dmasound/trans_16.c |    1 +
 2 files changed, 1 insertions(+), 1 deletions(-)

b7b3e71a257ec79c4894ece1f65806cc1c9af4c2

sound/oss/dmasound/dmasound.h +0 -1

index 222014c..a1b0b92 100644
@@ -270,7 +270,6 @@ extern int dmasound_catchRadius;
 #define SW_INPUT_VOLUME_SCALE	4
 #define SW_INPUT_VOLUME_DEFAULT	(128 / SW_INPUT_VOLUME_SCALE)
 
-extern int expand_bal;	/* Balance factor for expanding (not volume!) */
 extern int expand_read_bal;	/* Balance factor for reading */
 extern uint software_input_volume; /* software implemented recording volume! */

sound/oss/dmasound/trans_16.c +1 -0

index 23562e9..ca973ac 100644
@@ -17,6 +17,7 @@
 #include <asm/uaccess.h>
 #include "dmasound.h"
 
+extern int expand_bal;	/* Balance factor for expanding (not volume!) */
 static short dmasound_alaw2dma16[] ;
 static short dmasound_ulaw2dma16[] ;

Signature · 1 line

0.99.9.GIT