mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 19:56:18 +00:00
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>
This commit is contained in:
parent
d94e6fed6e
commit
f37c768c39
1 changed files with 2 additions and 3 deletions
|
@ -336,8 +336,6 @@ struct lance_addr {
|
||||||
|
|
||||||
/***************************** Prototypes *****************************/
|
/***************************** Prototypes *****************************/
|
||||||
|
|
||||||
static int addr_accessible( volatile void *regp, int wordflag, int
|
|
||||||
writeflag );
|
|
||||||
static unsigned long lance_probe1( struct net_device *dev, struct lance_addr
|
static unsigned long lance_probe1( struct net_device *dev, struct lance_addr
|
||||||
*init_rec );
|
*init_rec );
|
||||||
static int lance_open( struct net_device *dev );
|
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: */
|
/* 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;
|
int ret;
|
||||||
long flags;
|
long flags;
|
||||||
|
|
Loading…
Reference in a new issue