patch-2.3.16 linux/drivers/acorn/net/etherh.c

• Lines: 44
• Date: Mon Aug 30 18:15:21 1999
• Orig file: v2.3.15/linux/drivers/acorn/net/etherh.c
• Orig date: Wed Aug 18 11:38:59 1999

diff -u --recursive --new-file v2.3.15/linux/drivers/acorn/net/etherh.c linux/drivers/acorn/net/etherh.c
@@ -84,8 +84,8 @@
  * Read the ethernet address string from the on board rom.
  * This is an ascii string...
  */
-__initfunc(static int
-etherh_addr(char *addr, struct expansion_card *ec))
+static int __init
+etherh_addr(char *addr, struct expansion_card *ec)
 {
 	struct in_chunk_dir cd;
 	char *s;
@@ -352,8 +352,8 @@
 /*
  * This is the real probe routine.
  */
-__initfunc(static int
-etherh_probe1(struct net_device *dev))
+static int __init
+etherh_probe1(struct net_device *dev)
 {
 	static int version_printed;
 	unsigned int addr, i, reg0, tmp;
@@ -463,8 +463,8 @@
 	NULL
 };
 
-__initfunc(static void
-etherh_initdev(ecard_t *ec, struct net_device *dev))
+static void __init
+etherh_initdev(ecard_t *ec, struct net_device *dev)
 {
 	ecard_claim (ec);
 	
@@ -496,8 +496,8 @@
 }
 
 #ifndef MODULE
-__initfunc(int
-etherh_probe(struct net_device *dev))
+int __init
+etherh_probe(struct net_device *dev)
 {
 	if (!dev)
 		return ENODEV;