From d1baf5eeccababb4560700b66cb19ff67f8126dd Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Mon, 19 Nov 2012 13:22:09 -0500
Subject: [PATCH] --- yaml --- r: 338117 b: refs/heads/master c:
 c42ef5d21fc16e44361893eca333344022ede328 h: refs/heads/master i:   338115:
 e88c8aa2998ec32eeaeb02c55d86117d765c62ba v: v3

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

diff --git a/[refs] b/[refs]
index 9efcab0590b9..8a1f9baa500a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f2409060aba27120f601b2675e1e38754522b7c
+refs/heads/master: c42ef5d21fc16e44361893eca333344022ede328
diff --git a/trunk/drivers/staging/net/pc300_drv.c b/trunk/drivers/staging/net/pc300_drv.c
index b8e0480abad1..142eab493594 100644
--- a/trunk/drivers/staging/net/pc300_drv.c
+++ b/trunk/drivers/staging/net/pc300_drv.c
@@ -3409,7 +3409,7 @@ static void cpc_init_card(pc300_t * card)
 	board_nbr++;
 }
 
-static int __devinit
+static int
 cpc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
 	int err, eeprom_outdated = 0;