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/intel8x0.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/intel8x0.c')
-rw-r--r-- | sound/pci/intel8x0.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c index 6c896db..f9acf0f 100644 --- a/sound/pci/intel8x0.c +++ b/sound/pci/intel8x0.c @@ -2647,7 +2647,7 @@ static int intel8x0_resume(struct pci_dev *pci) pci_set_master(pci); snd_intel8x0_chip_init(chip, 0); if (request_irq(pci->irq, snd_intel8x0_interrupt, - IRQF_SHARED, card->shortname, chip)) { + IRQF_SHARED, KBUILD_MODNAME, chip)) { printk(KERN_ERR "intel8x0: unable to grab IRQ %d, " "disabling device\n", pci->irq); snd_card_disconnect(card); @@ -3106,7 +3106,7 @@ static int __devinit snd_intel8x0_create(struct snd_card *card, /* request irq after initializaing int_sta_mask, etc */ if (request_irq(pci->irq, snd_intel8x0_interrupt, - IRQF_SHARED, card->shortname, chip)) { + IRQF_SHARED, KBUILD_MODNAME, chip)) { snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); snd_intel8x0_free(chip); return -EBUSY; @@ -3266,7 +3266,7 @@ static void __devexit snd_intel8x0_remove(struct pci_dev *pci) } static struct pci_driver driver = { - .name = "Intel ICH", + .name = KBUILD_MODNAME, .id_table = snd_intel8x0_ids, .probe = snd_intel8x0_probe, .remove = __devexit_p(snd_intel8x0_remove), |