From 03bd282bf297d4a7bb2954a63232865445293d69 Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Mon, 3 Dec 2012 09:22:45 -0500
Subject: [PATCH] --- yaml --- r: 341748 b: refs/heads/master c:
 92a66593e5e7ae60242c430abac7bd710d1c7da0 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 5171dd6f060d..39f5a0fe545b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c8ac0f2ad53a96ac58efe7c98fac2986d081dfc
+refs/heads/master: 92a66593e5e7ae60242c430abac7bd710d1c7da0
diff --git a/trunk/drivers/net/ethernet/amd/am79c961a.c b/trunk/drivers/net/ethernet/amd/am79c961a.c
index e10ffad525a7..60e2b701afe7 100644
--- a/trunk/drivers/net/ethernet/amd/am79c961a.c
+++ b/trunk/drivers/net/ethernet/amd/am79c961a.c
@@ -671,7 +671,7 @@ static const struct net_device_ops am79c961_netdev_ops = {
 #endif
 };
 
-static int __devinit am79c961_probe(struct platform_device *pdev)
+static int am79c961_probe(struct platform_device *pdev)
 {
 	struct resource *res;
 	struct net_device *dev;