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/riptide/riptide.c | |
| parent | b028b81835d7503d68b230446cd5e39d14ff5b9f (diff) | |
| parent | ce1fd36932f230ac1757914b1e99b555c95bae8f (diff) | |
| download | linux-85e4d95da091e35209338962eca232e70819a485.tar.gz linux-85e4d95da091e35209338962eca232e70819a485.tar.xz | |
Merge branch 'test/pci-rename' into topic/misc
Diffstat (limited to 'sound/pci/riptide/riptide.c')
| -rw-r--r-- | sound/pci/riptide/riptide.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c index ad5202efd7a9..e34ae14908b3 100644 --- a/sound/pci/riptide/riptide.c +++ b/sound/pci/riptide/riptide.c @@ -1890,7 +1890,7 @@ snd_riptide_create(struct snd_card *card, struct pci_dev *pci, UNSET_AIE(hwport); if (request_irq(pci->irq, snd_riptide_interrupt, IRQF_SHARED, - "RIPTIDE", chip)) { + KBUILD_MODNAME, chip)) { snd_printk(KERN_ERR "Riptide: unable to grab IRQ %d\n", pci->irq); snd_riptide_free(chip); @@ -2176,7 +2176,7 @@ static void __devexit snd_card_riptide_remove(struct pci_dev *pci) } static struct pci_driver driver = { - .name = "RIPTIDE", + .name = KBUILD_MODNAME, .id_table = snd_riptide_ids, .probe = snd_card_riptide_probe, .remove = __devexit_p(snd_card_riptide_remove), @@ -2188,7 +2188,7 @@ static struct pci_driver driver = { #ifdef SUPPORT_JOYSTICK static struct pci_driver joystick_driver = { - .name = "Riptide Joystick", + .name = KBUILD_MODNAME "-joystick", .id_table = snd_riptide_joystick_ids, .probe = snd_riptide_joystick_probe, .remove = __devexit_p(snd_riptide_joystick_remove), |