ar71xx: merge board specific patches into one

[openwrt.git] / target / linux / ar71xx / patches-3.14 / 616-MIPS-ath79-ubnt-xw.patch

diff --git a/target/linux/ar71xx/patches-3.14/616-MIPS-ath79-ubnt-xw.patch b/target/linux/ar71xx/patches-3.14/616-MIPS-ath79-ubnt-xw.patch
index 1a983ef..2054efe 100644 (file)
--- a/target/linux/ar71xx/patches-3.14/616-MIPS-ath79-ubnt-xw.patch
+++ b/target/linux/ar71xx/patches-3.14/616-MIPS-ath79-ubnt-xw.patch
@@ -138,17 +138,3 @@
 +
 +MIPS_MACHINE(ATH79_MACH_UBNT_LOCO_M_XW, "UBNT-LOCO-XW", "Ubiquiti Loco M XW",
 +           ubnt_loco_m_xw_setup);
---- a/arch/mips/ath79/machtypes.h
-+++ b/arch/mips/ath79/machtypes.h
-@@ -123,9 +123,11 @@ enum ath79_mach_type {
-       ATH79_MACH_TL_WR941ND_V5,       /* TP-LINK TL-WR941ND v5 */
-       ATH79_MACH_UBNT_AIRROUTER,      /* Ubiquiti AirRouter */
-       ATH79_MACH_UBNT_BULLET_M,       /* Ubiquiti Bullet M */
-+      ATH79_MACH_UBNT_LOCO_M_XW,      /* Ubiquiti Loco M XW */
-       ATH79_MACH_UBNT_LSSR71,         /* Ubiquiti LS-SR71 */
-       ATH79_MACH_UBNT_LSX,            /* Ubiquiti LSX */
-       ATH79_MACH_UBNT_NANO_M,         /* Ubiquiti NanoStation M */
-+      ATH79_MACH_UBNT_NANO_M_XW,      /* Ubiquiti NanoStation M XW */
-       ATH79_MACH_UBNT_ROCKET_M,       /* Ubiquiti Rocket M */
-       ATH79_MACH_UBNT_RSPRO,          /* Ubiquiti RouterStation Pro */
-       ATH79_MACH_UBNT_RS,             /* Ubiquiti RouterStation */