diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-12-01 15:58:15 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-12-01 15:58:15 +0100 |
commit | b00615d163cd24fa98d155acfc1f9d81d6fe1103 (patch) | |
tree | dde815788aaea3e336aaaf24763311ce63a22e1b /sound/oss | |
parent | Merge branch 'topic/beep-rename' into topic/core-change (diff) | |
parent | ALSA: Remove old DMA-mmap code from arm/devdma.c (diff) | |
download | linux-b00615d163cd24fa98d155acfc1f9d81d6fe1103.tar.xz linux-b00615d163cd24fa98d155acfc1f9d81d6fe1103.zip |
Merge branch 'topic/pcm-dma-fix' into topic/core-change
Diffstat (limited to 'sound/oss')
-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 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; |