diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2011-07-22 08:43:24 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-07-22 08:43:24 +0200 |
| commit | 7d339ae99758bc21033d4a19bcd4f7b55f96e24e (patch) | |
| tree | a5bb46e47f7c4ae193cdf1a73c361144d6099df8 /sound/pci/lola/lola.c | |
| parent | Merge branch 'topic/asoc' into for-linus (diff) | |
| parent | ALSA: asihpi - Replace with snd_ctl_boolean_mono_info() (diff) | |
| download | linux-dev-7d339ae99758bc21033d4a19bcd4f7b55f96e24e.tar.xz linux-dev-7d339ae99758bc21033d4a19bcd4f7b55f96e24e.zip | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/pci/lola/lola.c')
| -rw-r--r-- | sound/pci/lola/lola.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/lola/lola.c b/sound/pci/lola/lola.c index 2692e5ae5f2d..3e92e5b5ec3d 100644 --- a/sound/pci/lola/lola.c +++ b/sound/pci/lola/lola.c @@ -648,7 +648,7 @@ static int __devinit lola_create(struct snd_card *card, struct pci_dev *pci, goto errout; if (request_irq(pci->irq, lola_interrupt, IRQF_SHARED, - DRVNAME, chip)) { + KBUILD_MODNAME, chip)) { printk(KERN_ERR SFX "unable to grab IRQ %d\n", pci->irq); err = -EBUSY; goto errout; @@ -771,7 +771,7 @@ MODULE_DEVICE_TABLE(pci, lola_ids); /* pci_driver definition */ static struct pci_driver driver = { - .name = DRVNAME, + .name = KBUILD_MODNAME, .id_table = lola_ids, .probe = lola_probe, .remove = __devexit_p(lola_remove), |