From 3e311fe111ae8910e36fd25c7e4b0f476d4e8c1c Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Mon, 19 Nov 2012 13:22:57 -0500
Subject: [PATCH] --- yaml --- r: 336919 b: refs/heads/master c:
 03f94c0f6215fa0cc471d07ffb3c4bcb1a0889c1 h: refs/heads/master i:   336917:
 4218485e3a687084d129c698f856fbf89268a4d8   336915:
 158285a1d6feb1422d0342e1da8d3959e7e56aad   336911:
 ffa9cc74a95dc514f545b7050c973e3f4b59143b v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/firewire/nosy.c | 2 +-
 trunk/drivers/firewire/ohci.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 94961de7f2a9..4e9e4f27714b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 678e8a6be911dd8684b894687ae88ff3b0ae4659
+refs/heads/master: 03f94c0f6215fa0cc471d07ffb3c4bcb1a0889c1
diff --git a/trunk/drivers/firewire/nosy.c b/trunk/drivers/firewire/nosy.c
index 4ebfb2273672..7a712b9ffb15 100644
--- a/trunk/drivers/firewire/nosy.c
+++ b/trunk/drivers/firewire/nosy.c
@@ -529,7 +529,7 @@ remove_card(struct pci_dev *dev)
 
 #define RCV_BUFFER_SIZE (16 * 1024)
 
-static int __devinit
+static int
 add_card(struct pci_dev *dev, const struct pci_device_id *unused)
 {
 	struct pcilynx *lynx;
diff --git a/trunk/drivers/firewire/ohci.c b/trunk/drivers/firewire/ohci.c
index 834e71d2324d..f25610bb3148 100644
--- a/trunk/drivers/firewire/ohci.c
+++ b/trunk/drivers/firewire/ohci.c
@@ -3537,7 +3537,7 @@ static inline void pmac_ohci_on(struct pci_dev *dev) {}
 static inline void pmac_ohci_off(struct pci_dev *dev) {}
 #endif /* CONFIG_PPC_PMAC */
 
-static int __devinit pci_probe(struct pci_dev *dev,
+static int pci_probe(struct pci_dev *dev,
 			       const struct pci_device_id *ent)
 {
 	struct fw_ohci *ohci;