aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tokenring
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-03-14 05:04:21 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-14 18:27:48 -0400
commitabf0437b420b1476b9afd56af69d1a725f51359c (patch)
tree8fd4cd9e9e42a3c2e5b58dc8852422a413230144 /drivers/net/tokenring
parent04ff97086b1a3237bbd1fe6390fa80fe75207e23 (diff)
[PATCH] ibmtr probe is __devinit, not __init
used by ->attach() in pcmcia analog Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Acked-by: Jeff Garzik <jeff@garzik.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/net/tokenring')
-rw-r--r--drivers/net/tokenring/ibmtr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/tokenring/ibmtr.c b/drivers/net/tokenring/ibmtr.c
index 36202e94ee91..01d55315ee8c 100644
--- a/drivers/net/tokenring/ibmtr.c
+++ b/drivers/net/tokenring/ibmtr.c
@@ -346,7 +346,7 @@ static void ibmtr_cleanup_card(struct net_device *dev)
346 * which references it. 346 * which references it.
347 ****************************************************************************/ 347 ****************************************************************************/
348 348
349static int __init ibmtr_probe(struct net_device *dev) 349static int __devinit ibmtr_probe(struct net_device *dev)
350{ 350{
351 int i; 351 int i;
352 int base_addr = dev->base_addr; 352 int base_addr = dev->base_addr;
@@ -366,7 +366,7 @@ static int __init ibmtr_probe(struct net_device *dev)
366 return -ENODEV; 366 return -ENODEV;
367} 367}
368 368
369int __init ibmtr_probe_card(struct net_device *dev) 369int __devinit ibmtr_probe_card(struct net_device *dev)
370{ 370{
371 int err = ibmtr_probe(dev); 371 int err = ibmtr_probe(dev);
372 if (!err) { 372 if (!err) {