diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-04-26 09:06:13 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-04-26 09:06:13 +0200 |
| commit | e34cc9148751956c4887fa7970217f8e227c8fdc (patch) | |
| tree | 45d080c7c55fc0474c385407d95d5c4b287cbd0e /sound | |
| parent | 60bc0887638a11ab8a86bbb4dd7859e34e61ecc4 (diff) | |
| parent | 867f1845c53f52e6b9822bea387c7b16740ba2f8 (diff) | |
Merge branch 'fix/misc' into for-next
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/isa/sb/es968.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/isa/sb/es968.c b/sound/isa/sb/es968.c index cafc3a7316a8..ff18286fef9d 100644 --- 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; |