diff --git a/[refs] b/[refs] index 9545abb26b71..cfaaf419586b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3756513d5fdc7b4ba814419165afcd10c6b1618d +refs/heads/master: 9a4729118c8851bce709a00eba1b3a8f1fd9ed58 diff --git a/trunk/sound/oss/dmasound/dmasound.h b/trunk/sound/oss/dmasound/dmasound.h index 222014cafc1a..a1b0b92af4b5 100644 --- a/trunk/sound/oss/dmasound/dmasound.h +++ b/trunk/sound/oss/dmasound/dmasound.h @@ -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 --git a/trunk/sound/oss/dmasound/trans_16.c b/trunk/sound/oss/dmasound/trans_16.c index 23562e947806..ca973ac2a30a 100644 --- a/trunk/sound/oss/dmasound/trans_16.c +++ b/trunk/sound/oss/dmasound/trans_16.c @@ -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[] ;