summaryrefslogtreecommitdiffstats
path: root/drivers/net/smc911x.c
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2007-11-12 12:07:04 +0100
committerMarc Kleine-Budde <mkl@pengutronix.de>2007-11-12 12:07:04 +0100
commit880c221b7699106f1ba1c2f27e15ad244f09c322 (patch)
treeeedf9667951066f8e1e853b877cb64a575227d22 /drivers/net/smc911x.c
parentaae8d892db9a0d305d144bf56a98d656c97eee20 (diff)
downloadbarebox-880c221b7699106f1ba1c2f27e15ad244f09c322.tar.gz
barebox-880c221b7699106f1ba1c2f27e15ad244f09c322.tar.xz
[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 <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net/smc911x.c')
-rw-r--r--drivers/net/smc911x.c4
1 files changed, 4 insertions, 0 deletions
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