ar71xx: use a separate board id for rocket m

SVN-Revision: 18450

target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c

@@ -308,7 +308,8 @@ static void __init ubnt_m_setup(void)
 					ubnt_m_gpio_buttons);
 }
 
-MIPS_MACHINE(AR71XX_MACH_UBNT_M, "Ubiquiti Bullet/Rocket M", ubnt_m_setup);
+MIPS_MACHINE(AR71XX_MACH_UBNT_BULLET_M, "Ubiquiti Bullet M", ubnt_m_setup);
+MIPS_MACHINE(AR71XX_MACH_UBNT_ROCKET_M, "Ubiquiti Rocket M", ubnt_m_setup);
 
 /* TODO detect the second ethernet port and use one
    init function for all Ubiquiti MIMO series products */

target/linux/ar71xx/files/arch/mips/ar71xx/prom.c

@@ -83,8 +83,11 @@ static struct board_rec boards[] __initdata = {
 		.name		= "UBNT-LSX",
 		.mach_type	= AR71XX_MACH_UBNT_LSX,
 	}, {
-		.name		= "UBNT-M",
-		.mach_type	= AR71XX_MACH_UBNT_M,
+		.name		= "UBNT-BM",
+		.mach_type	= AR71XX_MACH_UBNT_BULLET_M,
+	}, {
+		.name		= "UBNT-RM",
+		.mach_type	= AR71XX_MACH_UBNT_ROCKET_M,
 	}, {
 		.name		= "UBNT-NM",
 		.mach_type	= AR71XX_MACH_UBNT_NANO_M,

target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/ar71xx.h

@@ -140,8 +140,9 @@ enum ar71xx_mach_type {
 	AR71XX_MACH_UBNT_LSX,	/* Ubiquiti LSX */
 	AR71XX_MACH_UBNT_RS,	/* Ubiquiti RouterStation */
 	AR71XX_MACH_UBNT_RSPRO,	/* Ubiquiti RouterStation Pro */
-	AR71XX_MACH_UBNT_M, /* Ubiquiti Bullet M */
-	AR71XX_MACH_UBNT_NANO_M, /* Ubiquiti Bullet M */
+	AR71XX_MACH_UBNT_BULLET_M, /* Ubiquiti Bullet M */
+	AR71XX_MACH_UBNT_ROCKET_M, /* Ubiquiti Rocket M */
+	AR71XX_MACH_UBNT_NANO_M, /* Ubiquiti NanoStation M */
 	AR71XX_MACH_WNR2000,	/* NETGEAR WNR2000 */
 	AR71XX_MACH_WNDR3700,	/* NETGEAR WNDR3700 */
 	AR71XX_MACH_WP543,	/* Compex WP543 */