[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20080303213413.GN26072@cs181133002.pp.htv.fi>
Date: Mon, 3 Mar 2008 23:34:13 +0200
From: Adrian Bunk <bunk@...nel.org>
To: jgarzik@...ox.com, geert@...ux-m68k.org, zippel@...ux-m68k.org
Cc: netdev@...r.kernel.org, linux-kernel@...r.kernel.org,
linux-m68k@...ts.linux-m68k.org
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 <bunk@...nel.org>
---
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;
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists