diff options
author | Takashi Iwai | 2011-06-14 08:56:42 +0200 |
---|---|---|
committer | Takashi Iwai | 2011-06-14 08:56:42 +0200 |
commit | 85e4d95da091e35209338962eca232e70819a485 (patch) | |
tree | 8d1e9139d8b4187e639bf721c0818f49c0f22b85 /sound/pci/korg1212/korg1212.c | |
parent | ALSA: ctxfi: Implement a combined capabilities query method to replace multip... (diff) | |
parent | ALSA: Update document for using KBUILD_MODNAME (diff) | |
download | kernel-qcow2-linux-85e4d95da091e35209338962eca232e70819a485.tar.gz kernel-qcow2-linux-85e4d95da091e35209338962eca232e70819a485.tar.xz kernel-qcow2-linux-85e4d95da091e35209338962eca232e70819a485.zip |
Merge branch 'test/pci-rename' into topic/misc
Diffstat (limited to 'sound/pci/korg1212/korg1212.c')
-rw-r--r-- | sound/pci/korg1212/korg1212.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/korg1212/korg1212.c b/sound/pci/korg1212/korg1212.c index 6d795700be79..fc1d573cf306 100644 --- a/sound/pci/korg1212/korg1212.c +++ b/sound/pci/korg1212/korg1212.c @@ -2241,7 +2241,7 @@ static int __devinit snd_korg1212_create(struct snd_card *card, struct pci_dev * err = request_irq(pci->irq, snd_korg1212_interrupt, IRQF_SHARED, - "korg1212", korg1212); + KBUILD_MODNAME, korg1212); if (err) { snd_printk(KERN_ERR "korg1212: unable to grab IRQ %d\n", pci->irq); @@ -2477,7 +2477,7 @@ static void __devexit snd_korg1212_remove(struct pci_dev *pci) } static struct pci_driver driver = { - .name = "korg1212", + .name = KBUILD_MODNAME, .id_table = snd_korg1212_ids, .probe = snd_korg1212_probe, .remove = __devexit_p(snd_korg1212_remove), |