diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-11-24 17:16:30 +1100 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-11-24 17:16:30 +1100 |
commit | 1e43bee9c70654b4d52472c19e5f0a0cc18b6b36 (patch) | |
tree | ff601ec0c0d14125d0324f21b3c7e6d5e19fa252 /sound/oss/hex2hex.c | |
parent | 7d6709a20866a885916214590b7c394a21be9e25 (diff) | |
parent | a8a8a669ea13d792296737505adc43ccacf3a648 (diff) |
Merge commit 'origin/master' into next
Diffstat (limited to 'sound/oss/hex2hex.c')
-rw-r--r-- | sound/oss/hex2hex.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/hex2hex.c b/sound/oss/hex2hex.c index 5460faae98c..041ef5c52bc 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; |