diff options
| author | Adrian Bunk <bunk@kernel.org> | 2008-03-03 22:34:13 +0100 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2008-03-05 12:34:32 +0100 |
| commit | f37c768c39e3aeb8a508e1a45e461a506771445e (patch) | |
| tree | d32d7d9b805fe48d000dc6785cff1d3f67d88f20 /drivers/net | |
| parent | Intel ethernet adapter: Update MAINTAINERS (diff) | |
| download | linux-f37c768c39e3aeb8a508e1a45e461a506771445e.tar.xz linux-f37c768c39e3aeb8a508e1a45e461a506771445e.zip | |
fix drivers/net/atarilance.c compilation
This patch fixes the following build error:
<-- snip -->
...
CC [M] drivers/net/atarilance.o
{standard input}: Assembler messages:
{standard input}:406: Error: symbol `Lberr' is already defined
{standard input}:460: Error: symbol `Lberr' is already defined
make[3]: *** [drivers/net/atarilance.o] Error 1
<-- snip -->
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/atarilance.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/atarilance.c b/drivers/net/atarilance.c index b74dbeef8050..13c293b286de 100644 --- a/drivers/net/atarilance.c +++ b/drivers/net/atarilance.c @@ -336,8 +336,6 @@ struct lance_addr { /***************************** Prototypes *****************************/ -static int addr_accessible( volatile void *regp, int wordflag, int - writeflag ); static unsigned long lance_probe1( struct net_device *dev, struct lance_addr *init_rec ); static int lance_open( struct net_device *dev ); @@ -406,7 +404,8 @@ struct net_device * __init atarilance_probe(int unit) /* Derived from hwreg_present() in atari/config.c: */ -static int __init addr_accessible( volatile void *regp, int wordflag, int writeflag ) +static noinline int __init addr_accessible(volatile void *regp, int wordflag, + int writeflag) { int ret; long flags; |