From 2a6a17adc01ae2fd793317a40ec892f902b8d15a Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Mon, 14 Aug 2006 23:00:06 -0700
Subject: [PATCH] --- yaml --- r: 33494 b: refs/heads/master c:
 daca7cd7612639848c39744e02dab537755b31a1 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/net/tokenring/smctr.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 8fc940c54378..8468f02d3e9e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d2cdb4fd1cc1b15ad070a57c9b2bc40bb1565e7
+refs/heads/master: daca7cd7612639848c39744e02dab537755b31a1
diff --git a/trunk/drivers/net/tokenring/smctr.c b/trunk/drivers/net/tokenring/smctr.c
index cd2e0251e2bc..85a7f797d343 100644
--- a/trunk/drivers/net/tokenring/smctr.c
+++ b/trunk/drivers/net/tokenring/smctr.c
@@ -5666,7 +5666,7 @@ module_param_array(io, int, NULL, 0);
 module_param_array(irq, int, NULL, 0);
 module_param(ringspeed, int, 0);
 
-static struct net_device *setup_card(int n)
+static struct net_device * __init setup_card(int n)
 {
 	struct net_device *dev = alloc_trdev(sizeof(struct net_local));
 	int err;
@@ -5696,9 +5696,8 @@ static struct net_device *setup_card(int n)
 	free_netdev(dev);
 	return ERR_PTR(err);
 }
-			
 
-int init_module(void)
+int __init init_module(void)
 {
         int i, found = 0;
 	struct net_device *dev;