From 2948d4f9e27cee3823938123316a0c89735b7be1 Mon Sep 17 00:00:00 2001
From: Sedat Dilek <sedat.dilek@googlemail.com>
Date: Mon, 3 Jan 2011 11:06:58 +0000
Subject: [PATCH] --- yaml --- r: 225452 b: refs/heads/master c:
 cbad832239e70b91502a5e6ce1fc53a464ad6345 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index b85da9f7ae27..f4b5a950c49a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39980292fda20b38baf95bfa577db8b678eecc86
+refs/heads/master: cbad832239e70b91502a5e6ce1fc53a464ad6345
diff --git a/trunk/drivers/net/ksz884x.c b/trunk/drivers/net/ksz884x.c
index 49ea8708d6d0..540a8dcbcc46 100644
--- a/trunk/drivers/net/ksz884x.c
+++ b/trunk/drivers/net/ksz884x.c
@@ -6953,7 +6953,7 @@ static void read_other_addr(struct ksz_hw *hw)
 #define PCI_VENDOR_ID_MICREL_KS		0x16c6
 #endif
 
-static int __init pcidev_init(struct pci_dev *pdev,
+static int __devinit pcidev_init(struct pci_dev *pdev,
 	const struct pci_device_id *id)
 {
 	struct net_device *dev;