diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-08-08 10:45:31 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-08-08 10:45:31 +0200 |
| commit | 8c285645ab3b05942124020b5f0b89d3b539823a (patch) | |
| tree | db15972689f7f0b794244294836a1233beb37dd4 /sound/pci/cs4281.c | |
| parent | ASoC: sgtl5000: fix cache handling (diff) | |
| parent | ASoC: Acknowledge WM8996 interrupts before acting on them (diff) | |
| download | linux-8c285645ab3b05942124020b5f0b89d3b539823a.tar.xz linux-8c285645ab3b05942124020b5f0b89d3b539823a.zip | |
Merge branch 'wm8996-rename' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into fix/asoc
Diffstat (limited to 'sound/pci/cs4281.c')
| -rw-r--r-- | sound/pci/cs4281.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c index 6772070ed492..07f04e390aa1 100644 --- a/sound/pci/cs4281.c +++ b/sound/pci/cs4281.c @@ -1382,7 +1382,7 @@ static int __devinit snd_cs4281_create(struct snd_card *card, } if (request_irq(pci->irq, snd_cs4281_interrupt, IRQF_SHARED, - "CS4281", chip)) { + KBUILD_MODNAME, chip)) { snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); snd_cs4281_free(chip); return -ENOMEM; @@ -2085,7 +2085,7 @@ static int cs4281_resume(struct pci_dev *pci) #endif /* CONFIG_PM */ static struct pci_driver driver = { - .name = "CS4281", + .name = KBUILD_MODNAME, .id_table = snd_cs4281_ids, .probe = snd_cs4281_probe, .remove = __devexit_p(snd_cs4281_remove), |