diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-06-14 08:56:42 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-06-14 08:56:42 +0200 |
| commit | 85e4d95da091e35209338962eca232e70819a485 (patch) | |
| tree | 8d1e9139d8b4187e639bf721c0818f49c0f22b85 /sound/pci/atiixp.c | |
| parent | b028b81835d7503d68b230446cd5e39d14ff5b9f (diff) | |
| parent | ce1fd36932f230ac1757914b1e99b555c95bae8f (diff) | |
| download | op-kernel-dev-85e4d95da091e35209338962eca232e70819a485.zip op-kernel-dev-85e4d95da091e35209338962eca232e70819a485.tar.gz | |
Merge branch 'test/pci-rename' into topic/misc
Diffstat (limited to 'sound/pci/atiixp.c')
| -rw-r--r-- | sound/pci/atiixp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/atiixp.c b/sound/pci/atiixp.c index 3119cd9..537e0a2 100644 --- a/sound/pci/atiixp.c +++ b/sound/pci/atiixp.c @@ -1624,7 +1624,7 @@ static int __devinit snd_atiixp_create(struct snd_card *card, } if (request_irq(pci->irq, snd_atiixp_interrupt, IRQF_SHARED, - card->shortname, chip)) { + KBUILD_MODNAME, chip)) { snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); snd_atiixp_free(chip); return -EBUSY; @@ -1701,7 +1701,7 @@ static void __devexit snd_atiixp_remove(struct pci_dev *pci) } static struct pci_driver driver = { - .name = "ATI IXP AC97 controller", + .name = KBUILD_MODNAME, .id_table = snd_atiixp_ids, .probe = snd_atiixp_probe, .remove = __devexit_p(snd_atiixp_remove), |
