Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[firefly-linux-kernel-4.4.55.git] / arch / mips / loongson / common / machtype.c

diff --git a/arch/mips/loongson/common/machtype.c b/arch/mips/loongson/common/machtype.c
index 1a4797984b8d3f0c1d03681d5c059095d9847125..f2807bc662a34bfa0878fda0a7a3c29b81c7695f 100644 (file)
--- a/arch/mips/loongson/common/machtype.c
+++ b/arch/mips/loongson/common/machtype.c
@@ -19,19 +19,16 @@
 #define MACHTYPE_LEN 50
 
 static const char *system_types[] = {
-       [MACH_LOONGSON_UNKNOWN]         "unknown loongson machine",
-       [MACH_LEMOTE_FL2E]              "lemote-fuloong-2e-box",
-       [MACH_LEMOTE_FL2F]              "lemote-fuloong-2f-box",
-       [MACH_LEMOTE_ML2F7]             "lemote-mengloong-2f-7inches",
-       [MACH_LEMOTE_YL2F89]            "lemote-yeeloong-2f-8.9inches",
-       [MACH_DEXXON_GDIUM2F10]         "dexxon-gdium-2f",
-       [MACH_LEMOTE_NAS]               "lemote-nas-2f",
-       [MACH_LEMOTE_LL2F]              "lemote-lynloong-2f",
-       [MACH_LEMOTE_A1004]             "lemote-3a-notebook-a1004",
-       [MACH_LEMOTE_A1101]             "lemote-3a-itx-a1101",
-       [MACH_LEMOTE_A1201]             "lemote-2gq-notebook-a1201",
-       [MACH_LEMOTE_A1205]             "lemote-2gq-aio-a1205",
-       [MACH_LOONGSON_END]             NULL,
+       [MACH_LOONGSON_UNKNOWN] = "unknown loongson machine",
+       [MACH_LEMOTE_FL2E]      = "lemote-fuloong-2e-box",
+       [MACH_LEMOTE_FL2F]      = "lemote-fuloong-2f-box",
+       [MACH_LEMOTE_ML2F7]     = "lemote-mengloong-2f-7inches",
+       [MACH_LEMOTE_YL2F89]    = "lemote-yeeloong-2f-8.9inches",
+       [MACH_DEXXON_GDIUM2F10] = "dexxon-gdium-2f",
+       [MACH_LEMOTE_NAS]       = "lemote-nas-2f",
+       [MACH_LEMOTE_LL2F]      = "lemote-lynloong-2f",
+       [MACH_LOONGSON_GENERIC] = "generic-loongson-machine",
+       [MACH_LOONGSON_END]     = NULL,
 };
 
 const char *get_system_type(void)