aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/rme9652/hdspm.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-06-14 02:56:42 -0400
committerTakashi Iwai <tiwai@suse.de>2011-06-14 02:56:42 -0400
commit85e4d95da091e35209338962eca232e70819a485 (patch)
tree8d1e9139d8b4187e639bf721c0818f49c0f22b85 /sound/pci/rme9652/hdspm.c
parentb028b81835d7503d68b230446cd5e39d14ff5b9f (diff)
parentce1fd36932f230ac1757914b1e99b555c95bae8f (diff)
Merge branch 'test/pci-rename' into topic/misc
Diffstat (limited to 'sound/pci/rme9652/hdspm.c')
-rw-r--r--sound/pci/rme9652/hdspm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c
index 3f08afc0f0d3..c640f47b48bd 100644
--- a/sound/pci/rme9652/hdspm.c
+++ b/sound/pci/rme9652/hdspm.c
@@ -6441,7 +6441,7 @@ static int __devinit snd_hdspm_create(struct snd_card *card,
6441 hdspm->port + io_extent - 1); 6441 hdspm->port + io_extent - 1);
6442 6442
6443 if (request_irq(pci->irq, snd_hdspm_interrupt, 6443 if (request_irq(pci->irq, snd_hdspm_interrupt,
6444 IRQF_SHARED, "hdspm", hdspm)) { 6444 IRQF_SHARED, KBUILD_MODNAME, hdspm)) {
6445 snd_printk(KERN_ERR "HDSPM: unable to use IRQ %d\n", pci->irq); 6445 snd_printk(KERN_ERR "HDSPM: unable to use IRQ %d\n", pci->irq);
6446 return -EBUSY; 6446 return -EBUSY;
6447 } 6447 }
@@ -6779,7 +6779,7 @@ static void __devexit snd_hdspm_remove(struct pci_dev *pci)
6779} 6779}
6780 6780
6781static struct pci_driver driver = { 6781static struct pci_driver driver = {
6782 .name = "RME Hammerfall DSP MADI", 6782 .name = KBUILD_MODNAME,
6783 .id_table = snd_hdspm_ids, 6783 .id_table = snd_hdspm_ids,
6784 .probe = snd_hdspm_probe, 6784 .probe = snd_hdspm_probe,
6785 .remove = __devexit_p(snd_hdspm_remove), 6785 .remove = __devexit_p(snd_hdspm_remove),