From: Al Viro 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 Cc: Roman Zippel Signed-off-by: Andrew Morton --- sound/oss/dmasound/dmasound.h | 1 - sound/oss/dmasound/trans_16.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff -puN sound/oss/dmasound/dmasound.h~m68k-compile-fixes-for-dmasound-static-vs-extern sound/oss/dmasound/dmasound.h --- devel/sound/oss/dmasound/dmasound.h~m68k-compile-fixes-for-dmasound-static-vs-extern 2006-01-04 22:24:17.000000000 -0800 +++ devel-akpm/sound/oss/dmasound/dmasound.h 2006-01-04 22:24:17.000000000 -0800 @@ -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! */ diff -puN sound/oss/dmasound/trans_16.c~m68k-compile-fixes-for-dmasound-static-vs-extern sound/oss/dmasound/trans_16.c --- devel/sound/oss/dmasound/trans_16.c~m68k-compile-fixes-for-dmasound-static-vs-extern 2006-01-04 22:24:17.000000000 -0800 +++ devel-akpm/sound/oss/dmasound/trans_16.c 2006-01-04 22:24:17.000000000 -0800 @@ -17,6 +17,7 @@ #include #include "dmasound.h" +extern int expand_bal; /* Balance factor for expanding (not volume!) */ static short dmasound_alaw2dma16[] ; static short dmasound_ulaw2dma16[] ; _