diff options
| author | Geert Uytterhoeven <geert+renesas@glider.be> | 2015-01-15 11:52:19 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-01-15 14:09:37 -0500 |
| commit | 01fbd3f55cca25a6f9a4764d73da55615398c393 (patch) | |
| tree | a07fbbdcf6669e96299760819e65f7ee1ad10687 /drivers/net/ethernet/samsung | |
| parent | 9f6bd8fa5860fc7b041b10f2d463c78d65bdb59d (diff) | |
| download | linux-01fbd3f55cca25a6f9a4764d73da55615398c393.tar.bz2 | |
sh_eth: Fix addition of .trscer_err_mask to wrong SoC data
commit b284fbe3b3ef9cf8 ("sh_eth: Fix access to TRSCER register") wanted
to add a .trscer_err_mask value to the R-Car Gen2 family-specific data
structure (r8a779x_data), but it was accidentally added to the
SH7724-specific data structure (sh7724_data).
Presumably this happened due to a patch conflict with commit
d407bc0203539031 ("sh-eth: Set fdr_value of R-Car SoCs"), which added
another field at the same position.
Move the field setting to fix this.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Fixes: b284fbe3b3ef9cf8 ("sh_eth: Fix access to TRSCER register")
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/samsung')
0 files changed, 0 insertions, 0 deletions