X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=sound%2Foss%2Fad1848.c;h=8a197fd3c57e07602156d11f3acd1debe33e504c;hb=f6a975c50a1c5e68c376634b4331052990ca3dfd;hp=4d2a6ae978f720baa57faa391b665b060018da47;hpb=6b5b817f103450444f3f658a498f435d92a197e5;p=~andy%2Flinux

diff --git a/sound/oss/ad1848.c b/sound/oss/ad1848.c
index 4d2a6ae978f..8a197fd3c57 100644
--- a/sound/oss/ad1848.c
+++ b/sound/oss/ad1848.c
@@ -458,7 +458,7 @@ static int ad1848_set_recmask(ad1848_info * devc, int mask)
 	return mask;
 }
 
-static void change_bits(ad1848_info * devc, unsigned char *regval,
+static void oss_change_bits(ad1848_info *devc, unsigned char *regval,
 			unsigned char *muteval, int dev, int chn, int newval)
 {
 	unsigned char mask;
@@ -516,10 +516,10 @@ static void ad1848_mixer_set_channel(ad1848_info *devc, int dev, int value, int
 
 	if (muteregoffs != regoffs) {
 		muteval = ad_read(devc, muteregoffs);
-		change_bits(devc, &val, &muteval, dev, channel, value);
+		oss_change_bits(devc, &val, &muteval, dev, channel, value);
 	}
 	else
-		change_bits(devc, &val, &val, dev, channel, value);
+		oss_change_bits(devc, &val, &val, dev, channel, value);
 
 	spin_lock_irqsave(&devc->lock,flags);
 	ad_write(devc, regoffs, val);