Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / sound / pci / echoaudio / echoaudio.c

diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c
index 20763dd..d730698 100644 (file)
--- a/sound/pci/echoaudio/echoaudio.c
+++ b/sound/pci/echoaudio/echoaudio.c
@@ -1995,7 +1995,7 @@ static __devinit int snd_echo_create(struct snd_card *card,
                ioremap_nocache(chip->dsp_registers_phys, sz);
 
        if (request_irq(pci->irq, snd_echo_interrupt, IRQF_SHARED,
-                       ECHOCARD_NAME, chip)) {
+                       KBUILD_MODNAME, chip)) {
                snd_echo_free(chip);
                snd_printk(KERN_ERR "cannot grab irq\n");
                return -EBUSY;
@@ -2286,7 +2286,7 @@ static int snd_echo_resume(struct pci_dev *pci)
        kfree(commpage_bak);
 
        if (request_irq(pci->irq, snd_echo_interrupt, IRQF_SHARED,
-                       ECHOCARD_NAME, chip)) {
+                       KBUILD_MODNAME, chip)) {
                snd_echo_free(chip);
                snd_printk(KERN_ERR "cannot grab irq\n");
                return -EBUSY;
@@ -2327,7 +2327,7 @@ static void __devexit snd_echo_remove(struct pci_dev *pci)
 
 /* pci_driver definition */
 static struct pci_driver driver = {
-       .name = "Echoaudio " ECHOCARD_NAME,
+       .name = KBUILD_MODNAME,
        .id_table = snd_echo_ids,
        .probe = snd_echo_probe,
        .remove = __devexit_p(snd_echo_remove),