From 40ecb77d0b8425e04841a9813d58430dd8f25600 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Sun, 13 Aug 2006 12:44:07 +0200 Subject: [GCC4] fix build error in drivers/net/arlan.c This patch fixes these errors with gcc 4 : arlan.c:15: error: static declaration of 'arlan_version' follows non-static declaration arlan.h:54: error: previous declaration of 'arlan_version' was here arlan.c:23: error: static declaration of 'siteName' follows non-static declaration arlan.h:50: error: previous declaration of 'siteName' was here --- drivers/net/arlan.c | 2 +- drivers/net/arlan.h | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/drivers/net/arlan.c b/drivers/net/arlan.c index 204e651..f61269a 100644 --- a/drivers/net/arlan.c +++ b/drivers/net/arlan.c @@ -12,7 +12,7 @@ #if BITS_PER_LONG != 32 # error FIXME: this driver requires a 32-bit platform #endif -static const char *arlan_version = "C.Jennigs 97 & Elmer.Joandi@ut.ee Oct'98, http://www.ylenurme.ee/~elmer/655/"; +const char *arlan_version = "C.Jennigs 97 & Elmer.Joandi@ut.ee Oct'98, http://www.ylenurme.ee/~elmer/655/"; struct net_device *arlan_device[MAX_ARLANS]; int last_arlan; diff --git a/drivers/net/arlan.h b/drivers/net/arlan.h index f0c19ea..b80ea02 100644 --- a/drivers/net/arlan.h +++ b/drivers/net/arlan.h @@ -47,7 +47,6 @@ #endif extern struct net_device *arlan_device[MAX_ARLANS]; extern int arlan_debug; -extern char * siteName; extern int arlan_entry_debug; extern int arlan_exit_debug; extern int testMemory; -- 1.4.2