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/aw2/aw2-alsa.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/aw2/aw2-alsa.c')
| -rw-r--r-- | sound/pci/aw2/aw2-alsa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/aw2/aw2-alsa.c b/sound/pci/aw2/aw2-alsa.c index c15002242d98..f8569b11331b 100644 --- a/sound/pci/aw2/aw2-alsa.c +++ b/sound/pci/aw2/aw2-alsa.c @@ -171,7 +171,7 @@ MODULE_DEVICE_TABLE(pci, snd_aw2_ids); /* pci_driver definition */ static struct pci_driver driver = { - .name = "Emagic Audiowerk 2", + .name = KBUILD_MODNAME, .id_table = snd_aw2_ids, .probe = snd_aw2_probe, .remove = __devexit_p(snd_aw2_remove), @@ -317,7 +317,7 @@ static int __devinit snd_aw2_create(struct snd_card *card, snd_aw2_saa7146_setup(&chip->saa7146, chip->iobase_virt); if (request_irq(pci->irq, snd_aw2_saa7146_interrupt, - IRQF_SHARED, "Audiowerk2", chip)) { + IRQF_SHARED, KBUILD_MODNAME, chip)) { printk(KERN_ERR "aw2: Cannot grab irq %d\n", pci->irq); iounmap(chip->iobase_virt); |