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/lx6464es/lx6464es.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/lx6464es/lx6464es.c')
| -rw-r--r-- | sound/pci/lx6464es/lx6464es.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/lx6464es/lx6464es.c b/sound/pci/lx6464es/lx6464es.c index 1bd7a540fd49..38ae83951de0 100644 --- a/sound/pci/lx6464es/lx6464es.c +++ b/sound/pci/lx6464es/lx6464es.c @@ -1031,7 +1031,7 @@ static int __devinit snd_lx6464es_create(struct snd_card *card, chip->port_dsp_bar = pci_ioremap_bar(pci, 2); err = request_irq(pci->irq, lx_interrupt, IRQF_SHARED, - card_name, chip); + KBUILD_MODNAME, chip); if (err) { snd_printk(KERN_ERR LXP "unable to grab IRQ %d\n", pci->irq); goto request_irq_failed; @@ -1137,7 +1137,7 @@ static void __devexit snd_lx6464es_remove(struct pci_dev *pci) static struct pci_driver driver = { - .name = "Digigram LX6464ES", + .name = KBUILD_MODNAME, .id_table = snd_lx6464es_ids, .probe = snd_lx6464es_probe, .remove = __devexit_p(snd_lx6464es_remove), |