summaryrefslogtreecommitdiffstats
path: root/sound/oss/hex2hex.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-01-12 12:59:05 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-01-12 12:59:05 +0000
commit163849ea9b4c5d50fbd324692461983d18faadad (patch)
tree7176a18fea53560eb4092aa103d94a266ab4e60d /sound/oss/hex2hex.c
parent2138301e1687bd4f22aa2b4df4829b6ffdae19bc (diff)
parent5ee518ecbcb5934e284ea51a19a939c891f5f7ea (diff)
downloadop-kernel-dev-163849ea9b4c5d50fbd324692461983d18faadad.zip
op-kernel-dev-163849ea9b4c5d50fbd324692461983d18faadad.tar.gz
Merge branch 'for-2.6.33' into for-2.6.34
Diffstat (limited to 'sound/oss/hex2hex.c')
-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 5460faa..041ef5c 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