diff options
| author | Ingo Molnar <mingo@elte.hu> | 2012-03-14 02:44:11 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-03-14 02:44:11 -0400 |
| commit | cd593accdcc27ccbe6498d9ad1c2b6cc8e1d830d (patch) | |
| tree | 9424d3ac86e753706cc6c3d7e6072d2a73711e29 /drivers/net/ethernet/renesas/sh_eth.h | |
| parent | 11b91d6fe7272452c999573bab33c15c2f03dc31 (diff) | |
| parent | fde7d9049e55ab85a390be7f415d74c9f62dd0f9 (diff) | |
Merge tag 'v3.3-rc7' into x86/mce
Merge reason: Update from an ancient -rc1 base to an almost-final stable kernel.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 | ||