2008-03-03 21:36:08

by Adrian Bunk

Subject: [2.6 patch] 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 <[email protected]>

---

drivers/net/atarilance.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

0e01f8d77cf240995235717a4e8582dfefab2926 foobar
diff --git a/drivers/net/atarilance.c b/drivers/net/atarilance.c
index b74dbee..d612dd4 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;

2008-03-05 12:19:00

by Jeff Garzik

Subject: Re: [2.6 patch] fix drivers/net/atarilance.c compilation

Adrian Bunk wrote:
> 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 <[email protected]>

applied