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 branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
sound
/
isa
/
sb
/
es968.c
diff --git
a/sound/isa/sb/es968.c
b/sound/isa/sb/es968.c
index
cafc3a7
..
ff18286
100644
(file)
--- a/
sound/isa/sb/es968.c
+++ b/
sound/isa/sb/es968.c
@@
-93,7
+93,7
@@
static int __devinit snd_card_es968_pnp(int dev, struct snd_card_es968 *acard,
return err;
}
port[dev] = pnp_port_start(pdev, 0);
- dma8[dev] = pnp_dma(pdev,
1
);
+ dma8[dev] = pnp_dma(pdev,
0
);
irq[dev] = pnp_irq(pdev, 0);
return 0;