From 0ae8dceaebe3659ee0c3352c08125f403e77ebca Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Tue, 28 Sep 1999 22:25:29 +0000 Subject: Merge with 2.3.10. --- drivers/net/3c501.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/net/3c501.c') diff --git a/drivers/net/3c501.c b/drivers/net/3c501.c index 6c2a672ec..029571460 100644 --- a/drivers/net/3c501.c +++ b/drivers/net/3c501.c @@ -210,7 +210,7 @@ struct net_local struct netdev_entry el1_drv = {"3c501", el1_probe1, EL1_IO_EXTENT, netcard_portlist}; #else -__initfunc(int el1_probe(struct device *dev)) +int __init el1_probe(struct device *dev) { int i; int base_addr = dev ? dev->base_addr : 0; @@ -237,7 +237,7 @@ __initfunc(int el1_probe(struct device *dev)) * The actual probe. */ -__initfunc(static int el1_probe1(struct device *dev, int ioaddr)) +static int __init el1_probe1(struct device *dev, int ioaddr) { struct net_local *lp; const char *mname; /* Vendor name */ -- cgit v1.2.3