Merge git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa

[sfrench/cifs-2.6.git] / sound / core / oss / linear.c

diff --git a/sound/core/oss/linear.c b/sound/core/oss/linear.c
index ef331230b3a6ba01c2d913b693950a443935ace2..5b1bcdc64779d7c446b89bd70602af52e63300f7 100644 (file)
--- a/sound/core/oss/linear.c
+++ b/sound/core/oss/linear.c
@@ -106,7 +106,7 @@ static snd_pcm_sframes_t linear_transfer(struct snd_pcm_plugin *plugin,
        return frames;
 }
 
-int conv_index(int src_format, int dst_format)
+static int conv_index(int src_format, int dst_format)
 {
        int src_endian, dst_endian, sign, src_width, dst_width;