git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge with /home/shaggy/git/linus-clean/
[pandora-kernel.git]
/
sound
/
oss
/
esssolo1.c
diff --git
a/sound/oss/esssolo1.c
b/sound/oss/esssolo1.c
index
a4ecab2
..
849b59f
100644
(file)
--- a/
sound/oss/esssolo1.c
+++ b/
sound/oss/esssolo1.c
@@
-515,7
+515,7
@@
static inline int prog_dmabuf_adc(struct solo1_state *s)
return 0;
}
-static in
line in
t prog_dmabuf_dac(struct solo1_state *s)
+static int prog_dmabuf_dac(struct solo1_state *s)
{
unsigned long va;
int c;