From: Geert Uytterhoeven <geert+renesas@glider.be>
Date: Thu, 15 Jan 2015 10:52:19 +0000 (+0100)
Subject: sh_eth: Fix addition of .trscer_err_mask to wrong SoC data
X-Git-Tag: fixes-v4.0-rc1~271^2~17
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01fbd3f55cca25a6f9a4764d73da55615398c393;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed