diff options
| author | Takashi Iwai | 2011-07-22 08:43:24 +0200 |
|---|---|---|
| committer | Takashi Iwai | 2011-07-22 08:43:24 +0200 |
| commit | 7d339ae99758bc21033d4a19bcd4f7b55f96e24e (patch) | |
| tree | a5bb46e47f7c4ae193cdf1a73c361144d6099df8 /sound/pci/rme9652/hdspm.c | |
| parent | Merge branch 'topic/asoc' into for-linus (diff) | |
| parent | ALSA: asihpi - Replace with snd_ctl_boolean_mono_info() (diff) | |
| download | kernel-qcow2-linux-7d339ae99758bc21033d4a19bcd4f7b55f96e24e.tar.gz kernel-qcow2-linux-7d339ae99758bc21033d4a19bcd4f7b55f96e24e.tar.xz kernel-qcow2-linux-7d339ae99758bc21033d4a19bcd4f7b55f96e24e.zip | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/pci/rme9652/hdspm.c')
| -rw-r--r-- | sound/pci/rme9652/hdspm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c index c8e402fc3782..af130ee0c45d 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, hdspm->port + io_extent - 1); if (request_irq(pci->irq, snd_hdspm_interrupt, - IRQF_SHARED, "hdspm", hdspm)) { + IRQF_SHARED, KBUILD_MODNAME, hdspm)) { snd_printk(KERN_ERR "HDSPM: unable to use IRQ %d\n", pci->irq); return -EBUSY; } @@ -6779,7 +6779,7 @@ static void __devexit snd_hdspm_remove(struct pci_dev *pci) } static struct pci_driver driver = { - .name = "RME Hammerfall DSP MADI", + .name = KBUILD_MODNAME, .id_table = snd_hdspm_ids, .probe = snd_hdspm_probe, .remove = __devexit_p(snd_hdspm_remove), |