diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-06 07:43:13 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-06 07:43:13 -0500 |
| commit | b2faf597d93bdf5e2d12d93ea0815935a73f749e (patch) | |
| tree | 1876616290ff282b8a0814e2429d23e0104f3701 /sound/isa/gus | |
| parent | 638e174688f58200d0deb7435093435e7d737b09 (diff) | |
| parent | 410c05427a69f53851637ccb85c2212131409fbd (diff) | |
Merge branch 'origin'
Diffstat (limited to 'sound/isa/gus')
| -rw-r--r-- | sound/isa/gus/gusclassic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/isa/gus/gusclassic.c b/sound/isa/gus/gusclassic.c index d1165b96fa3f..91c219116d7a 100644 --- a/sound/isa/gus/gusclassic.c +++ b/sound/isa/gus/gusclassic.c | |||
| @@ -195,7 +195,7 @@ static int __init snd_gusclassic_probe(struct platform_device *pdev) | |||
| 195 | goto _err; | 195 | goto _err; |
| 196 | } | 196 | } |
| 197 | sprintf(card->longname + strlen(card->longname), " at 0x%lx, irq %d, dma %d", gus->gf1.port, xirq, xdma1); | 197 | sprintf(card->longname + strlen(card->longname), " at 0x%lx, irq %d, dma %d", gus->gf1.port, xirq, xdma1); |
| 198 | if (dma2 >= 0) | 198 | if (xdma2 >= 0) |
| 199 | sprintf(card->longname + strlen(card->longname), "&%d", xdma2); | 199 | sprintf(card->longname + strlen(card->longname), "&%d", xdma2); |
| 200 | 200 | ||
| 201 | snd_card_set_dev(card, &pdev->dev); | 201 | snd_card_set_dev(card, &pdev->dev); |