adm5120: nuke adm5120_mach_type, use mips_machtype instead

[openwrt/openwrt.git] / target / linux / adm5120 / files / arch / mips / adm5120 / common / prom.c

diff --git a/target/linux/adm5120/files/arch/mips/adm5120/common/prom.c b/target/linux/adm5120/files/arch/mips/adm5120/common/prom.c
index adc9e8c71a3e3c734e3afb7ec818995feeb7e272..81ba365a0ee5ae07b582439f1ccb7db57bb182d3 100644 (file)
--- a/target/linux/adm5120/files/arch/mips/adm5120/common/prom.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/common/prom.c
@@ -202,35 +202,35 @@ static void __init prom_detect_machtype(void)
 {
        if (bootbase_present()) {
                adm5120_prom_type = ADM5120_PROM_BOOTBASE;
-               adm5120_mach_type = detect_machtype_bootbase();
+               mips_machtype = detect_machtype_bootbase();
                return;
        }
 
        if (cfe_present()) {
                adm5120_prom_type = ADM5120_PROM_CFE;
-               adm5120_mach_type = detect_machtype_cfe();
+               mips_machtype = detect_machtype_cfe();
                return;
        }
 
        if (myloader_present()) {
                adm5120_prom_type = ADM5120_PROM_MYLOADER;
-               adm5120_mach_type = detect_machtype_myloader();
+               mips_machtype = detect_machtype_myloader();
                return;
        }
 
        if (routerboot_present()) {
                adm5120_prom_type = ADM5120_PROM_ROUTERBOOT;
-               adm5120_mach_type = detect_machtype_routerboot();
+               mips_machtype = detect_machtype_routerboot();
                return;
        }
 
        if (generic_prom_present()) {
                adm5120_prom_type = ADM5120_PROM_GENERIC;
-               adm5120_mach_type = detect_machtype_generic();
+               mips_machtype = detect_machtype_generic();
                return;
        }
 
-       adm5120_mach_type = MACH_ADM5120_GENERIC;
+       mips_machtype = MACH_ADM5120_GENERIC;
 }
 
 #ifdef CONFIG_IMAGE_CMDLINE_HACK