diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-06-14 02:56:42 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-06-14 02:56:42 -0400 |
| commit | 85e4d95da091e35209338962eca232e70819a485 (patch) | |
| tree | 8d1e9139d8b4187e639bf721c0818f49c0f22b85 /sound/pci/es1968.c | |
| parent | b028b81835d7503d68b230446cd5e39d14ff5b9f (diff) | |
| parent | ce1fd36932f230ac1757914b1e99b555c95bae8f (diff) | |
Merge branch 'test/pci-rename' into topic/misc
Diffstat (limited to 'sound/pci/es1968.c')
| -rw-r--r-- | sound/pci/es1968.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c index ab0a6156a704..3fa46593a3b9 100644 --- a/sound/pci/es1968.c +++ b/sound/pci/es1968.c | |||
| @@ -2746,7 +2746,7 @@ static int __devinit snd_es1968_create(struct snd_card *card, | |||
| 2746 | } | 2746 | } |
| 2747 | chip->io_port = pci_resource_start(pci, 0); | 2747 | chip->io_port = pci_resource_start(pci, 0); |
| 2748 | if (request_irq(pci->irq, snd_es1968_interrupt, IRQF_SHARED, | 2748 | if (request_irq(pci->irq, snd_es1968_interrupt, IRQF_SHARED, |
| 2749 | "ESS Maestro", chip)) { | 2749 | KBUILD_MODNAME, chip)) { |
| 2750 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); | 2750 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
| 2751 | snd_es1968_free(chip); | 2751 | snd_es1968_free(chip); |
| 2752 | return -EBUSY; | 2752 | return -EBUSY; |
| @@ -2925,7 +2925,7 @@ static void __devexit snd_es1968_remove(struct pci_dev *pci) | |||
| 2925 | } | 2925 | } |
| 2926 | 2926 | ||
| 2927 | static struct pci_driver driver = { | 2927 | static struct pci_driver driver = { |
| 2928 | .name = "ES1968 (ESS Maestro)", | 2928 | .name = KBUILD_MODNAME, |
| 2929 | .id_table = snd_es1968_ids, | 2929 | .id_table = snd_es1968_ids, |
| 2930 | .probe = snd_es1968_probe, | 2930 | .probe = snd_es1968_probe, |
| 2931 | .remove = __devexit_p(snd_es1968_remove), | 2931 | .remove = __devexit_p(snd_es1968_remove), |