summaryrefslogtreecommitdiffstats
path: root/sound/oss
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-12-01 15:58:15 +0100
committerTakashi Iwai <tiwai@suse.de>2009-12-01 15:58:15 +0100
commitb00615d163cd24fa98d155acfc1f9d81d6fe1103 (patch)
treedde815788aaea3e336aaaf24763311ce63a22e1b /sound/oss
parent75639e7ee1401b3876c7a00ffe96ea8027668690 (diff)
parentd6797322231af98b9bb4afb175dd614cf511e5f7 (diff)
downloadblackbird-op-linux-b00615d163cd24fa98d155acfc1f9d81d6fe1103.tar.gz
blackbird-op-linux-b00615d163cd24fa98d155acfc1f9d81d6fe1103.zip
Merge branch 'topic/pcm-dma-fix' into topic/core-change
Diffstat (limited to 'sound/oss')
-rw-r--r--sound/oss/hex2hex.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/hex2hex.c b/sound/oss/hex2hex.c
index 5460faae98c9..041ef5c52bc2 100644
--- a/sound/oss/hex2hex.c
+++ b/sound/oss/hex2hex.c
@@ -12,7 +12,7 @@
#define MAX_SIZE (256*1024)
unsigned char buf[MAX_SIZE];
-int loadhex(FILE *inf, unsigned char *buf)
+static int loadhex(FILE *inf, unsigned char *buf)
{
int l=0, c, i;
OpenPOWER on IntegriCloud