From e0695cd94915fb8fec471cb0f3bf5589b721f743 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Sat, 22 Nov 2008 17:35:44 +0000
Subject: [PATCH] --- yaml --- r: 119312 b: refs/heads/master c:
 8814b5050d183f00a25a087b550841797c0c2775 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 0c9c02a34892..7533db5e3d8e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43ced651d1272ced02ed5f1c2abc79e3354187f6
+refs/heads/master: 8814b5050d183f00a25a087b550841797c0c2775
diff --git a/trunk/drivers/net/pcmcia/ibmtr_cs.c b/trunk/drivers/net/pcmcia/ibmtr_cs.c
index cf3cca4642f2..f51944b28cfa 100644
--- a/trunk/drivers/net/pcmcia/ibmtr_cs.c
+++ b/trunk/drivers/net/pcmcia/ibmtr_cs.c
@@ -349,7 +349,7 @@ static int ibmtr_suspend(struct pcmcia_device *link)
 	return 0;
 }
 
-static int ibmtr_resume(struct pcmcia_device *link)
+static int __devinit ibmtr_resume(struct pcmcia_device *link)
 {
 	ibmtr_dev_t *info = link->priv;
 	struct net_device *dev = info->dev;