mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
[PATCH] m68k: compile fixes for dmasound (static vs. extern)
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 <viro@zeniv.linux.org.uk> Cc: Roman Zippel <zippel@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
3756513d5f
commit
9a4729118c
2 changed files with 1 additions and 1 deletions
|
@ -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! */
|
||||
|
||||
|
|
|
@ -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[] ;
|
||||
|
||||
|
|
Loading…
Reference in a new issue