These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / mips / ar7 / platform.c

diff --git a/kernel/arch/mips/ar7/platform.c b/kernel/arch/mips/ar7/platform.c
index be9ff16..58fca9a 100644 (file)
--- a/kernel/arch/mips/ar7/platform.c
+++ b/kernel/arch/mips/ar7/platform.c
@@ -39,7 +39,6 @@
 
 #include <asm/addrspace.h>
 #include <asm/mach-ar7/ar7.h>
-#include <asm/mach-ar7/gpio.h>
 #include <asm/mach-ar7/prom.h>
 
 /*****************************************************************************
@@ -679,7 +678,8 @@ static int __init ar7_register_devices(void)
        }
 
        if (ar7_has_high_cpmac()) {
-               res = fixed_phy_add(PHY_POLL, cpmac_high.id, &fixed_phy_status);
+               res = fixed_phy_add(PHY_POLL, cpmac_high.id,
+                                   &fixed_phy_status, -1);
                if (!res) {
                        cpmac_get_mac(1, cpmac_high_data.dev_addr);
 
@@ -692,7 +692,7 @@ static int __init ar7_register_devices(void)
        } else
                cpmac_low_data.phy_mask = 0xffffffff;
 
-       res = fixed_phy_add(PHY_POLL, cpmac_low.id, &fixed_phy_status);
+       res = fixed_phy_add(PHY_POLL, cpmac_low.id, &fixed_phy_status, -1);
        if (!res) {
                cpmac_get_mac(0, cpmac_low_data.dev_addr);
                res = platform_device_register(&cpmac_low);