patch-2.3.16 linux/drivers/net/eepro.c
Next file: linux/drivers/net/eth16i.c
Previous file: linux/drivers/net/defxx.c
Back to the patch index
Back to the overall index
- Lines: 34
- Date:
Thu Aug 26 14:26:40 1999
- Orig file:
v2.3.15/linux/drivers/net/eepro.c
- Orig date:
Wed Aug 18 11:36:42 1999
diff -u --recursive --new-file v2.3.15/linux/drivers/net/eepro.c linux/drivers/net/eepro.c
@@ -23,7 +23,7 @@
This is a compatibility hardware problem.
Versions:
- 0.11d added __initdata, __initfunc stuff; call spin_lock_init
+ 0.11d added __initdata, __init stuff; call spin_lock_init
in eepro_probe1. Replaced "eepro" by dev->name. Augmented
the code protected by spin_lock in interrupt routine
(PdP, 12/12/1998)
@@ -157,7 +157,6 @@
/* I had reports of looong delays with SLOW_DOWN defined as udelay(2) */
#define SLOW_DOWN inb(0x80)
/* udelay(2) */
-#define compat_init_func(X) __initfunc(X)
#define compat_init_data __initdata
#else
@@ -166,7 +165,6 @@
#define compat_dev_kfree_skb( skb, mode ) dev_kfree_skb( (skb), (mode) )
#define test_and_set_bit(a,b) set_bit((a),(b))
#define SLOW_DOWN SLOW_DOWN_IO
-#define compat_init_func(X) X
#define compat_init_data
#endif
@@ -461,7 +459,7 @@
struct netdev_entry netcard_drv =
{"eepro", eepro_probe1, EEPRO_IO_EXTENT, eepro_portlist};
#else
-compat_init_func(int eepro_probe(struct net_device *dev))
+int __init eepro_probe(struct net_device *dev)
{
int i;
int base_addr = dev ? dev->base_addr : 0;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)