From: Luka Perkov <luka@openwrt.org>
Date: Sat, 7 Feb 2015 21:10:51 +0000 (+0000)
Subject: ar71xx: rb2011: apply patch to file
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0067ab8e396947a7c41ddc4336cd23ea2b4cb414;p=openwrt%2Fstaging%2Fjow.git

ar71xx: rb2011: apply patch to file

Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 44314
---

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb2011.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-rb2011.c
index b73fae63a5..afd56085c7 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb2011.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-rb2011.c
@@ -321,6 +321,13 @@ static void __init rb2011us_setup(void)
 
 MIPS_MACHINE_NONAME(ATH79_MACH_RB_2011US, "2011US", rb2011us_setup);
 
+static void __init rb2011r5_setup(void)
+{
+	rb2011_setup(RB2011_FLAG_SFP | RB2011_FLAG_USB | RB2011_FLAG_WLAN);
+}
+
+MIPS_MACHINE_NONAME(ATH79_MACH_RB_2011R5, "2011r5", rb2011r5_setup);
+
 static void __init rb2011g_setup(void)
 {
 	rb2011_setup(RB2011_FLAG_SFP |
diff --git a/target/linux/ar71xx/patches-3.14/716-MIPS-ath79-add_mikrotik_rb2011uias.patch b/target/linux/ar71xx/patches-3.14/716-MIPS-ath79-add_mikrotik_rb2011uias.patch
deleted file mode 100644
index 73c3b5b1b8..0000000000
--- a/target/linux/ar71xx/patches-3.14/716-MIPS-ath79-add_mikrotik_rb2011uias.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/arch/mips/ath79/mach-rb2011.c
-+++ b/arch/mips/ath79/mach-rb2011.c
-@@ -321,6 +321,13 @@ static void __init rb2011us_setup(void)
- 
- MIPS_MACHINE_NONAME(ATH79_MACH_RB_2011US, "2011US", rb2011us_setup);
- 
-+static void __init rb2011r5_setup(void)
-+{
-+	rb2011_setup(RB2011_FLAG_SFP | RB2011_FLAG_USB);
-+}
-+
-+MIPS_MACHINE_NONAME(ATH79_MACH_RB_2011R5, "2011r5", rb2011r5_setup);
-+
- static void __init rb2011g_setup(void)
- {
- 	rb2011_setup(RB2011_FLAG_SFP |
diff --git a/target/linux/ar71xx/patches-3.14/725-MIPS-ath79-add_mikrotik_rb2011uias-2hnd.patch b/target/linux/ar71xx/patches-3.14/725-MIPS-ath79-add_mikrotik_rb2011uias-2hnd.patch
deleted file mode 100644
index 4660371f28..0000000000
--- a/target/linux/ar71xx/patches-3.14/725-MIPS-ath79-add_mikrotik_rb2011uias-2hnd.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/mips/ath79/mach-rb2011.c
-+++ b/arch/mips/ath79/mach-rb2011.c
-@@ -323,7 +323,7 @@ MIPS_MACHINE_NONAME(ATH79_MACH_RB_2011US
- 
- static void __init rb2011r5_setup(void)
- {
--	rb2011_setup(RB2011_FLAG_SFP | RB2011_FLAG_USB);
-+	rb2011_setup(RB2011_FLAG_SFP | RB2011_FLAG_USB | RB2011_FLAG_WLAN);
- }
- 
- MIPS_MACHINE_NONAME(ATH79_MACH_RB_2011R5, "2011r5", rb2011r5_setup);