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/cs5535audio | |
| parent | 13b137ef0367237909bb2dc38babfb8305154676 (diff) | |
| parent | 000477a0fe1af14355a52622a77ccce8bfd7230d (diff) | |
| download | linux-next-7d339ae99758bc21033d4a19bcd4f7b55f96e24e.tar.gz | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/pci/cs5535audio')
| -rw-r--r-- | sound/pci/cs5535audio/cs5535audio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/cs5535audio/cs5535audio.c b/sound/pci/cs5535audio/cs5535audio.c index afb803708416..10d22ed5fece 100644 --- a/sound/pci/cs5535audio/cs5535audio.c +++ b/sound/pci/cs5535audio/cs5535audio.c @@ -311,7 +311,7 @@ static int __devinit snd_cs5535audio_create(struct snd_card *card, cs5535au->port = pci_resource_start(pci, 0); if (request_irq(pci->irq, snd_cs5535audio_interrupt, - IRQF_SHARED, "CS5535 Audio", cs5535au)) { + IRQF_SHARED, KBUILD_MODNAME, cs5535au)) { snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); err = -EBUSY; goto sndfail; @@ -395,7 +395,7 @@ static void __devexit snd_cs5535audio_remove(struct pci_dev *pci) } static struct pci_driver driver = { - .name = DRIVER_NAME, + .name = KBUILD_MODNAME, .id_table = snd_cs5535audio_ids, .probe = snd_cs5535audio_probe, .remove = __devexit_p(snd_cs5535audio_remove), |