summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2008-11-22 17:35:44 +0000
committerLinus Torvalds <torvalds@linux-foundation.org>2008-11-30 10:03:37 -0800
commit8814b5050d183f00a25a087b550841797c0c2775 (patch)
tree89239332c224f222e1ebea2cbe8609a2624592e9 /drivers
parent43ced651d1272ced02ed5f1c2abc79e3354187f6 (diff)
downloadtalos-op-linux-8814b5050d183f00a25a087b550841797c0c2775.tar.gz
talos-op-linux-8814b5050d183f00a25a087b550841797c0c2775.zip
section misannotation in ibmtr_cs
ibmtr_resume() is calling ibmtr_probe(), which is devinit. Whether that's the right thing to do there is a separate question, but since it's PCMCIA and thus will never compile without HOTPLUG... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/pcmcia/ibmtr_cs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/pcmcia/ibmtr_cs.c b/drivers/net/pcmcia/ibmtr_cs.c
index cf3cca4642f2..f51944b28cfa 100644
--- a/drivers/net/pcmcia/ibmtr_cs.c
+++ b/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;
OpenPOWER on IntegriCloud