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/ice1712/ice1712.c | |
| parent | 13b137ef0367237909bb2dc38babfb8305154676 (diff) | |
| parent | 000477a0fe1af14355a52622a77ccce8bfd7230d (diff) | |
| download | linux-3.10-7d339ae99758bc21033d4a19bcd4f7b55f96e24e.tar.gz linux-3.10-7d339ae99758bc21033d4a19bcd4f7b55f96e24e.tar.bz2 linux-3.10-7d339ae99758bc21033d4a19bcd4f7b55f96e24e.zip | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/pci/ice1712/ice1712.c')
| -rw-r--r-- | sound/pci/ice1712/ice1712.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c index f4594d76b6e..be06fb3e45a 100644 --- a/sound/pci/ice1712/ice1712.c +++ b/sound/pci/ice1712/ice1712.c @@ -2607,7 +2607,7 @@ static int __devinit snd_ice1712_create(struct snd_card *card, ice->profi_port = pci_resource_start(pci, 3); if (request_irq(pci->irq, snd_ice1712_interrupt, IRQF_SHARED, - "ICE1712", ice)) { + KBUILD_MODNAME, ice)) { snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); snd_ice1712_free(ice); return -EIO; @@ -2802,7 +2802,7 @@ static void __devexit snd_ice1712_remove(struct pci_dev *pci) } static struct pci_driver driver = { - .name = "ICE1712", + .name = KBUILD_MODNAME, .id_table = snd_ice1712_ids, .probe = snd_ice1712_probe, .remove = __devexit_p(snd_ice1712_remove), |