2 files changed, 7 insertions, 2 deletions

diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 2bb21ffbde3a..01f6811f1324 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -3935,11 +3935,14 @@ static int __devinit skge_probe(struct pci_dev *pdev,
 #endif
 
         err = -ENOMEM;
-        hw = kzalloc(sizeof(*hw), GFP_KERNEL);
+        /* space for skge@pci:0000:04:00.0 */
+        hw = kzalloc(sizeof(*hw) + strlen(DRV_NAME "@pci:" )
+                     + strlen(pci_name(pdev)) + 1, GFP_KERNEL);
         if (!hw) {
                 dev_err(&pdev->dev, "cannot allocate hardware struct\n");
                 goto err_out_free_regions;
         }
+        sprintf(hw->irq_name, DRV_NAME "@pci:%s", pci_name(pdev));
 
         hw->pdev = pdev;
         spin_lock_init(&hw->hw_lock);
@@ -3974,7 +3977,7 @@ static int __devinit skge_probe(struct pci_dev *pdev,
                 goto err_out_free_netdev;
         }
 
-        err = request_irq(pdev->irq, skge_intr, IRQF_SHARED, dev->name, hw);
+        err = request_irq(pdev->irq, skge_intr, IRQF_SHARED, hw->irq_name, hw);
         if (err) {
                 dev_err(&pdev->dev, "%s: cannot assign irq %d\n",
                        dev->name, pdev->irq);
diff --git a/drivers/net/skge.h b/drivers/net/skge.h
index 17caccbb7685..831de1b6e96e 100644
--- a/drivers/net/skge.h
+++ b/drivers/net/skge.h
@@ -2423,6 +2423,8 @@ struct skge_hw {
         u16                  phy_addr;
         spinlock_t           phy_lock;
         struct tasklet_struct phy_task;
+
+        char                 irq_name[0]; /* skge@pci:000:04:00.0 */
 };
 
 enum pause_control {