From 6191e9df357fb6aa8763ed2766a949aab343ea22 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Wed, 30 Jan 2008 22:02:07 +0200
Subject: [PATCH] --- yaml --- r: 82643 b: refs/heads/master c:
 de11743e23b83e2ddf99a757ab2ebb62bd4c29f0 h: refs/heads/master i:   82641:
 022e5765a1a2e85c9675692e14e3f07e76fce837   82639:
 cba52d5de4247e9af67cfe6c106d19821549bcd9 v: v3

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

diff --git a/[refs] b/[refs]
index 5c69c00fbf85..290df4b961e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 976006f10b4ff1c8440436b92571b1fcedaf3cd0
+refs/heads/master: de11743e23b83e2ddf99a757ab2ebb62bd4c29f0
diff --git a/trunk/drivers/net/tokenring/olympic.c b/trunk/drivers/net/tokenring/olympic.c
index e7b4adc5c4e7..433c994ea9d8 100644
--- a/trunk/drivers/net/tokenring/olympic.c
+++ b/trunk/drivers/net/tokenring/olympic.c
@@ -434,7 +434,7 @@ static int __devinit olympic_init(struct net_device *dev)
 
 }
 
-static int olympic_open(struct net_device *dev) 
+static int __devinit olympic_open(struct net_device *dev) 
 {
 	struct olympic_private *olympic_priv=netdev_priv(dev);
 	u8 __iomem *olympic_mmio=olympic_priv->olympic_mmio,*init_srb;