From 6efc5bdf7d4bf57fabb1c07344d7e886e5b8de79 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Tue, 11 Dec 2007 23:23:06 +0100
Subject: [PATCH] --- yaml --- r: 75020 b: refs/heads/master c:
 33390a700129aa03f3808c35de017650a688f82a h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/s2io.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3bab4ed2637a..980df61e65b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2b75f0cd7cb14874f179d2c09c81f77ad784df2
+refs/heads/master: 33390a700129aa03f3808c35de017650a688f82a
diff --git a/trunk/drivers/net/s2io.c b/trunk/drivers/net/s2io.c
index 121cb100f93a..9d80f1cf73ac 100644
--- a/trunk/drivers/net/s2io.c
+++ b/trunk/drivers/net/s2io.c
@@ -3737,7 +3737,7 @@ static int s2io_enable_msi_x(struct s2io_nic *nic)
 }
 
 /* Handle software interrupt used during MSI(X) test */
-static irqreturn_t __devinit s2io_test_intr(int irq, void *dev_id)
+static irqreturn_t s2io_test_intr(int irq, void *dev_id)
 {
 	struct s2io_nic *sp = dev_id;
 
@@ -3748,7 +3748,7 @@ static irqreturn_t __devinit s2io_test_intr(int irq, void *dev_id)
 }
 
 /* Test interrupt path by forcing a a software IRQ */
-static int __devinit s2io_test_msi(struct s2io_nic *sp)
+static int s2io_test_msi(struct s2io_nic *sp)
 {
 	struct pci_dev *pdev = sp->pdev;
 	struct XENA_dev_config __iomem *bar0 = sp->bar0;