diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2007-11-12 15:58:53 +0100 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2007-11-12 15:58:53 +0100 |
| commit | 57cae4e82669748f94fad4d741c3fcf9cde128ac (patch) | |
| tree | 5b1f0466cf3dd63d0878d3d19f71339002294db2 /drivers/net | |
| parent | fcfd25606c7387a3e0e9c6d85aca88d97159ae70 (diff) | |
| parent | e3b2a8f972b6ca224dee9edc1ead369c6b8ed350 (diff) | |
| download | barebox-57cae4e82669748f94fad4d741c3fcf9cde128ac.tar.gz barebox-57cae4e82669748f94fad4d741c3fcf9cde128ac.tar.xz | |
Merge branch 'ipe337'
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/smc911x.c | 4 |
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 |