aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2015-02-07 21:10:51 +0000
committerLuka Perkov <luka@openwrt.org>2015-02-07 21:10:51 +0000
commit6f611e41a86e42c74a7112e2d275ad38a4d69fe6 (patch)
treef8041ab7077d7ec13cb343d8608cec6f93fa2719
parentc6241cff96d95737405211273f8337b52a0b47f3 (diff)
downloadupstream-6f611e41a86e42c74a7112e2d275ad38a4d69fe6.tar.gz
upstream-6f611e41a86e42c74a7112e2d275ad38a4d69fe6.tar.bz2
upstream-6f611e41a86e42c74a7112e2d275ad38a4d69fe6.zip
ar71xx: rb2011: apply patch to file
Signed-off-by: Luka Perkov <luka@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44314 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/ar71xx/files/arch/mips/ath79/mach-rb2011.c7
-rw-r--r--target/linux/ar71xx/patches-3.14/716-MIPS-ath79-add_mikrotik_rb2011uias.patch16
-rw-r--r--target/linux/ar71xx/patches-3.14/725-MIPS-ath79-add_mikrotik_rb2011uias-2hnd.patch11
3 files changed, 7 insertions, 27 deletions
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);