Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

[~andy/linux] / sound / pci / als300.c

diff --git a/sound/pci/als300.c b/sound/pci/als300.c
index d7653cb7ac60dc24f5d3e07ff1537f18a32e1299..736c8e93db1f69454d070606fcb04d1395d4179a 100644 (file)
--- a/sound/pci/als300.c
+++ b/sound/pci/als300.c
@@ -722,7 +722,7 @@ static int __devinit snd_als300_create(struct snd_card *card,
                irq_handler = snd_als300_interrupt;
 
        if (request_irq(pci->irq, irq_handler, IRQF_SHARED,
-                       card->shortname, chip)) {
+                       KBUILD_MODNAME, chip)) {
                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                snd_als300_free(chip);
                return -EBUSY;
@@ -846,7 +846,7 @@ static int __devinit snd_als300_probe(struct pci_dev *pci,
 }
 
 static struct pci_driver driver = {
-       .name = "ALS300",
+       .name = KBUILD_MODNAME,
        .id_table = snd_als300_ids,
        .probe = snd_als300_probe,
        .remove = __devexit_p(snd_als300_remove),