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/atarilance.c | |
| parent | 273767781288c35c9d679e908672b9996cda4c34 (diff) | |
Merge with 2.3.10.
Diffstat (limited to 'drivers/net/atarilance.c')
| -rw-r--r-- | drivers/net/atarilance.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/atarilance.c b/drivers/net/atarilance.c index c79fd581e..de439cb27 100644 --- a/drivers/net/atarilance.c +++ b/drivers/net/atarilance.c @@ -370,9 +370,9 @@ void *slow_memcpy( void *dst, const void *src, size_t len ) } -__initfunc(int atarilance_probe( struct device *dev )) - -{ int i; +int __init atarilance_probe( struct device *dev ) +{ + int i; static int found = 0; if (!MACH_IS_ATARI || found) @@ -393,9 +393,9 @@ __initfunc(int atarilance_probe( struct device *dev )) /* Derived from hwreg_present() in atari/config.c: */ -__initfunc(static int addr_accessible( volatile void *regp, int wordflag, int writeflag )) - -{ int ret; +static int __init addr_accessible( volatile void *regp, int wordflag, int writeflag ) +{ + int ret; long flags; long *vbr, save_berr; @@ -443,10 +443,10 @@ __initfunc(static int addr_accessible( volatile void *regp, int wordflag, int wr } -__initfunc(static unsigned long lance_probe1( struct device *dev, - struct lance_addr *init_rec )) - -{ volatile unsigned short *memaddr = +static unsigned long __init lance_probe1( struct device *dev, + struct lance_addr *init_rec ) +{ + volatile unsigned short *memaddr = (volatile unsigned short *)init_rec->memaddr; volatile unsigned short *ioaddr = (volatile unsigned short *)init_rec->ioaddr; |