diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-06-14 08:56:42 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-06-14 08:56:42 +0200 |
| commit | 85e4d95da091e35209338962eca232e70819a485 (patch) | |
| tree | 8d1e9139d8b4187e639bf721c0818f49c0f22b85 /sound/pci/ens1370.c | |
| parent | b028b81835d7503d68b230446cd5e39d14ff5b9f (diff) | |
| parent | ce1fd36932f230ac1757914b1e99b555c95bae8f (diff) | |
Merge branch 'test/pci-rename' into topic/misc
Diffstat (limited to 'sound/pci/ens1370.c')
| -rw-r--r-- | sound/pci/ens1370.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c index 863eafea691..f02e2f8d712 100644 --- a/sound/pci/ens1370.c +++ b/sound/pci/ens1370.c @@ -2120,7 +2120,7 @@ static int __devinit snd_ensoniq_create(struct snd_card *card, } ensoniq->port = pci_resource_start(pci, 0); if (request_irq(pci->irq, snd_audiopci_interrupt, IRQF_SHARED, - "Ensoniq AudioPCI", ensoniq)) { + KBUILD_MODNAME, ensoniq)) { snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); snd_ensoniq_free(ensoniq); return -EBUSY; @@ -2489,7 +2489,7 @@ static void __devexit snd_audiopci_remove(struct pci_dev *pci) } static struct pci_driver driver = { - .name = DRIVER_NAME, + .name = KBUILD_MODNAME, .id_table = snd_audiopci_ids, .probe = snd_audiopci_probe, .remove = __devexit_p(snd_audiopci_remove), |