Merge branch 'test/pci-rename' into topic/misc

3 files changed, 3 insertions, 3 deletions

diff --git a/sound/pci/ctxfi/cthw20k1.c b/sound/pci/ctxfi/cthw20k1.c
index 1ff692a9d016..a7df19791f5a 100644
--- a/sound/pci/ctxfi/cthw20k1.c
+++ b/sound/pci/ctxfi/cthw20k1.c
@@ -1940,7 +1940,7 @@ static int hw_card_start(struct hw *hw)
 
         if (hw->irq < 0) {
                 err = request_irq(pci->irq, ct_20k1_interrupt, IRQF_SHARED,
-                                  "ctxfi", hw);
+                                  KBUILD_MODNAME, hw);
                 if (err < 0) {
                         printk(KERN_ERR "XFi: Cannot get irq %d\n", pci->irq);
                         goto error2;
diff --git a/sound/pci/ctxfi/cthw20k2.c b/sound/pci/ctxfi/cthw20k2.c
index ea559a9e2934..1aa083272703 100644
--- a/sound/pci/ctxfi/cthw20k2.c
+++ b/sound/pci/ctxfi/cthw20k2.c
@@ -2064,7 +2064,7 @@ static int hw_card_start(struct hw *hw)
 
         if (hw->irq < 0) {
                 err = request_irq(pci->irq, ct_20k2_interrupt, IRQF_SHARED,
-                                  "ctxfi", hw);
+                                  KBUILD_MODNAME, hw);
                 if (err < 0) {
                         printk(KERN_ERR "XFi: Cannot get irq %d\n", pci->irq);
                         goto error2;
diff --git a/sound/pci/ctxfi/xfi.c b/sound/pci/ctxfi/xfi.c
index 7afa765afa3c..b259aa03a3a9 100644
--- a/sound/pci/ctxfi/xfi.c
+++ b/sound/pci/ctxfi/xfi.c
@@ -143,7 +143,7 @@ static int ct_card_resume(struct pci_dev *pci)
 #endif
 
 static struct pci_driver ct_driver = {
-        .name = "SB-XFi",
+        .name = KBUILD_MODNAME,
         .id_table = ct_pci_dev_ids,
         .probe = ct_card_probe,
         .remove = __devexit_p(ct_card_remove),