Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livep...

[firefly-linux-kernel-4.4.55.git] / drivers / edac / octeon_edac-l2c.c

diff --git a/drivers/edac/octeon_edac-l2c.c b/drivers/edac/octeon_edac-l2c.c
index 7e98084d36451efe894f5f33c1a3b77748183af3..afea7fc625ccb30bec2c3f69e1dadf1b74dadac2 100644 (file)
--- a/drivers/edac/octeon_edac-l2c.c
+++ b/drivers/edac/octeon_edac-l2c.c
@@ -151,7 +151,7 @@ static int octeon_l2c_probe(struct platform_device *pdev)
        l2c->ctl_name = "octeon_l2c_err";
 
 
-       if (OCTEON_IS_MODEL(OCTEON_FAM_1_PLUS)) {
+       if (OCTEON_IS_OCTEON1PLUS()) {
                union cvmx_l2t_err l2t_err;
                union cvmx_l2d_err l2d_err;