ar71xx: nuke AR71XX_MACH_UBNT_AR71XX machtype

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21764 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c
index d77d915..130d9e4 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c
@@ -161,9 +161,6 @@ static void __init ubnt_rs_setup(void)
 MIPS_MACHINE(AR71XX_MACH_UBNT_RS, "UBNT-RS", "Ubiquiti RouterStation",
             ubnt_rs_setup);
 
 MIPS_MACHINE(AR71XX_MACH_UBNT_RS, "UBNT-RS", "Ubiquiti RouterStation",
             ubnt_rs_setup);
 

-MIPS_MACHINE(AR71XX_MACH_UBNT_AR71XX, "Ubiquiti AR71xx-based board",
-            "Ubiquiti RouterStation", ubnt_rs_setup);
-

 #define UBNT_RSPRO_WAN_PHYMASK (1 << 4)
 #define UBNT_RSPRO_LAN_PHYMASK ((1 << 0) | (1 << 1) | (1 << 2) | (1 << 3))
 
 #define UBNT_RSPRO_WAN_PHYMASK (1 << 4)
 #define UBNT_RSPRO_LAN_PHYMASK ((1 << 0) | (1 << 1) | (1 << 2) | (1 << 3))
 

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/machtype.h b/target/linux/ar71xx/files/arch/mips/ar71xx/machtype.h
index 15e5b96..37ed7d8 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/machtype.h
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/machtype.h
@@ -44,7 +44,6 @@ enum ar71xx_mach_type {
        AR71XX_MACH_UBNT_LSSR71, /* Ubiquiti LS-SR71 */
        AR71XX_MACH_UBNT_LSX,   /* Ubiquiti LSX */
        AR71XX_MACH_UBNT_RS,    /* Ubiquiti RouterStation */
        AR71XX_MACH_UBNT_LSSR71, /* Ubiquiti LS-SR71 */
        AR71XX_MACH_UBNT_LSX,   /* Ubiquiti LSX */
        AR71XX_MACH_UBNT_RS,    /* Ubiquiti RouterStation */

-       AR71XX_MACH_UBNT_AR71XX, /* Ubiquiti AR71xx-based board */

        AR71XX_MACH_UBNT_RSPRO, /* Ubiquiti RouterStation Pro */
        AR71XX_MACH_UBNT_BULLET_M, /* Ubiquiti Bullet M */
        AR71XX_MACH_UBNT_ROCKET_M, /* Ubiquiti Rocket M */
        AR71XX_MACH_UBNT_RSPRO, /* Ubiquiti RouterStation Pro */
        AR71XX_MACH_UBNT_BULLET_M, /* Ubiquiti Bullet M */
        AR71XX_MACH_UBNT_ROCKET_M, /* Ubiquiti Rocket M */