diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-02-22 09:20:07 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-22 09:20:18 -0500 |
| commit | 2daa79ec2126f8e710391e9d8e8f0d31d7c91d5f (patch) | |
| tree | ab89c74c09c2986fa01c25ad8e45989a48a18899 /drivers/net/ethernet/renesas/sh_eth.h | |
| parent | 7dae8c5209147ad06d424928a5f1ec45caa87691 (diff) | |
| parent | 678a0222edc9da43a22145d68647500ee85e6c04 (diff) | |
Merge branch 'lpc32xx/drivers' into next/drivers
* lpc32xx/drivers: (566 commits)
ARM: LPC32xx: ADC support for mach-lpc32xx
Includes an update to Linux 3.3-rc4
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/net/ethernet/renesas/sh_eth.h')
| -rw-r--r-- | drivers/net/ethernet/renesas/sh_eth.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/ethernet/renesas/sh_eth.h b/drivers/net/ethernet/renesas/sh_eth.h index 47877b13ffad..cdbd844662a7 100644 --- a/drivers/net/ethernet/renesas/sh_eth.h +++ b/drivers/net/ethernet/renesas/sh_eth.h | |||
| @@ -575,9 +575,6 @@ enum RPADIR_BIT { | |||
| 575 | RPADIR_PADR = 0x0003f, | 575 | RPADIR_PADR = 0x0003f, |
| 576 | }; | 576 | }; |
| 577 | 577 | ||
| 578 | /* RFLR */ | ||
| 579 | #define RFLR_VALUE 0x1000 | ||
| 580 | |||
| 581 | /* FDR */ | 578 | /* FDR */ |
| 582 | #define DEFAULT_FDR_INIT 0x00000707 | 579 | #define DEFAULT_FDR_INIT 0x00000707 |
| 583 | 580 | ||