diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
| commit | 0ae8dceaebe3659ee0c3352c08125f403e77ebca (patch) | |
| tree | 5085c389f09da78182b899d19fe1068b619a69dd /drivers/net/de620.c | |
| parent | 273767781288c35c9d679e908672b9996cda4c34 (diff) | |
Merge with 2.3.10.
Diffstat (limited to 'drivers/net/de620.c')
| -rw-r--r-- | drivers/net/de620.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/de620.c b/drivers/net/de620.c index 28a318637..8ae2803a3 100644 --- a/drivers/net/de620.c +++ b/drivers/net/de620.c @@ -820,8 +820,8 @@ adapter_init(struct device *dev) * * Check if there is a DE-620 connected */ -__initfunc(int -de620_probe(struct device *dev)) +int __init +de620_probe(struct device *dev) { static struct net_device_stats de620_netstats; int i; @@ -913,8 +913,8 @@ de620_probe(struct device *dev)) */ #define sendit(dev,data) de620_set_register(dev, W_EIP, data | EIPRegister); -__initfunc(static unsigned short -ReadAWord(struct device *dev, int from)) +static unsigned short __init +ReadAWord(struct device *dev, int from) { unsigned short data; int nbits; @@ -956,8 +956,8 @@ ReadAWord(struct device *dev, int from)) return data; } -__initfunc(static int -read_eeprom(struct device *dev)) +static int __init +read_eeprom(struct device *dev) { unsigned short wrd; |