From 880c221b7699106f1ba1c2f27e15ad244f09c322 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Mon, 12 Nov 2007 12:07:04 +0100 Subject: [smsc911x] undef FLOW if already defined fixes: drivers/net/smc911x.c:334:1: warning: "FLOW" redefined In file included from include/asm/blackfin.h:33, from include/asm/system.h:29, from include/asm/bitops.h:33, from include/linux/bitops.h:69, from include/common.h:31, from drivers/net/smc911x.c:29: include/asm/cpu/defBF561.h:1654:1: warning: this is the location of the previous definition Signed-off-by: Marc Kleine-Budde --- drivers/net/smc911x.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'drivers/net/smc911x.c') diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index ccfcc957f5..32e107746b 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c @@ -331,6 +331,10 @@ #define MII_DATA 0x07 /* R/W mask 0x0000FFFFUL */ +#ifdef FLOW +#undef FLOW /* clashed with include/asm/cpu/defBF561.h:1654 */ +#endif + #define FLOW 0x08 /* R/W */ #define FLOW_FCPT 0xFFFF0000 #define FLOW_FCPASS 0x00000004 -- cgit v1.2.3