diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-07-22 08:43:24 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-07-22 08:43:24 +0200 |
| commit | 7d339ae99758bc21033d4a19bcd4f7b55f96e24e (patch) | |
| tree | a5bb46e47f7c4ae193cdf1a73c361144d6099df8 /sound/pci/trident/trident_main.c | |
| parent | 13b137ef0367237909bb2dc38babfb8305154676 (diff) | |
| parent | 000477a0fe1af14355a52622a77ccce8bfd7230d (diff) | |
| download | blackbird-op-linux-7d339ae99758bc21033d4a19bcd4f7b55f96e24e.tar.gz blackbird-op-linux-7d339ae99758bc21033d4a19bcd4f7b55f96e24e.zip | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/pci/trident/trident_main.c')
| -rw-r--r-- | sound/pci/trident/trident_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c index 2870a4fdc130..5bd57a7c52d2 100644 --- a/sound/pci/trident/trident_main.c +++ b/sound/pci/trident/trident_main.c @@ -3598,7 +3598,7 @@ int __devinit snd_trident_create(struct snd_card *card, trident->port = pci_resource_start(pci, 0); if (request_irq(pci->irq, snd_trident_interrupt, IRQF_SHARED, - "Trident Audio", trident)) { + KBUILD_MODNAME, trident)) { snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); snd_trident_free(trident); return -EBUSY; |
