From 4bf4c31e8fd622dce8ec3bd467c6418c7534c391 Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Mon, 3 Dec 2012 09:23:08 -0500
Subject: [PATCH] --- yaml --- r: 341771 b: refs/heads/master c:
 4f2c53ea27a8d12aaf07f61b5d13d20cadfdefd0 h: refs/heads/master i:   341769:
 681e2becb7f9134af2a525f0584c311589e64463   341767:
 ebec907e3788d42348ac8e59fa543b8ce354aaa5 v: v3

---
 [refs]                                                      | 2 +-
 trunk/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c | 2 +-
 trunk/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c  | 4 ++--
 trunk/drivers/net/ethernet/freescale/fs_enet/mii-fec.c      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 91e8aa098dcc..5d5bb009202b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 64bc40de134bb5c7826ff384016f654219ed3956
+refs/heads/master: 4f2c53ea27a8d12aaf07f61b5d13d20cadfdefd0
diff --git a/trunk/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c b/trunk/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
index 2b7633f766d9..e9879c5af7ba 100644
--- a/trunk/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
+++ b/trunk/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
@@ -1004,7 +1004,7 @@ static const struct net_device_ops fs_enet_netdev_ops = {
 };
 
 static struct of_device_id fs_enet_match[];
-static int __devinit fs_enet_probe(struct platform_device *ofdev)
+static int fs_enet_probe(struct platform_device *ofdev)
 {
 	const struct of_device_id *match;
 	struct net_device *ndev;
diff --git a/trunk/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c b/trunk/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c
index 151453309401..3f35b6a983e9 100644
--- a/trunk/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c
+++ b/trunk/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c
@@ -108,7 +108,7 @@ static struct mdiobb_ops bb_ops = {
 	.get_mdio_data = mdio_read,
 };
 
-static int __devinit fs_mii_bitbang_init(struct mii_bus *bus,
+static int fs_mii_bitbang_init(struct mii_bus *bus,
                                          struct device_node *np)
 {
 	struct resource res;
@@ -150,7 +150,7 @@ static int __devinit fs_mii_bitbang_init(struct mii_bus *bus,
 	return 0;
 }
 
-static int __devinit fs_enet_mdio_probe(struct platform_device *ofdev)
+static int fs_enet_mdio_probe(struct platform_device *ofdev)
 {
 	struct mii_bus *new_bus;
 	struct bb_info *bitbang;
diff --git a/trunk/drivers/net/ethernet/freescale/fs_enet/mii-fec.c b/trunk/drivers/net/ethernet/freescale/fs_enet/mii-fec.c
index cdf702a59485..18e8ef203736 100644
--- a/trunk/drivers/net/ethernet/freescale/fs_enet/mii-fec.c
+++ b/trunk/drivers/net/ethernet/freescale/fs_enet/mii-fec.c
@@ -102,7 +102,7 @@ static int fs_enet_fec_mii_reset(struct mii_bus *bus)
 }
 
 static struct of_device_id fs_enet_mdio_fec_match[];
-static int __devinit fs_enet_mdio_probe(struct platform_device *ofdev)
+static int fs_enet_mdio_probe(struct platform_device *ofdev)
 {
 	const struct of_device_id *match;
 	struct resource res;