From: Weijie Gao <hackpascal@gmail.com>
Date: Sun, 18 Nov 2018 15:49:23 +0000 (+0800)
Subject: ramips: merge two patches 101-mt7621-timer and 998-mt7621-needs-jiffies
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1bc8ca9e38ac7ff797454de200a3fd8a2375d3e5;p=openwrt%2Fstaging%2Fjow.git

ramips: merge two patches 101-mt7621-timer and 998-mt7621-needs-jiffies

These two patches both modified the mt7621.c, and the patch file
998-mt7621-needs-jiffies.patch adds only one line which is used by the
another patch file. So merge them into one file.

Signed-off-by: Weijie Gao <hackpascal@gmail.com>
(backported from e217d69a4a9cc0adc327cb3f8773ab8bf7c60124)
(rebased patches)
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/target/linux/ramips/patches-4.14/101-mt7621-timer.patch b/target/linux/ramips/patches-4.14/101-mt7621-timer.patch
index ea8be56942..509b6e52dc 100644
--- a/target/linux/ramips/patches-4.14/101-mt7621-timer.patch
+++ b/target/linux/ramips/patches-4.14/101-mt7621-timer.patch
@@ -1,6 +1,14 @@
 --- a/arch/mips/ralink/mt7621.c
 +++ b/arch/mips/ralink/mt7621.c
-@@ -16,6 +16,7 @@
+@@ -9,6 +9,7 @@
+ 
+ #include <linux/kernel.h>
+ #include <linux/init.h>
++#include <linux/jiffies.h>
+ 
+ #include <asm/mipsregs.h>
+ #include <asm/smp-ops.h>
+@@ -16,6 +17,7 @@
  #include <asm/mach-ralink/ralink_regs.h>
  #include <asm/mach-ralink/mt7621.h>
  #include <asm/mips-boards/launch.h>
@@ -8,7 +16,7 @@
  
  #include <pinmux.h>
  
-@@ -177,6 +178,58 @@ bool plat_cpu_core_present(int core)
+@@ -177,6 +179,58 @@ bool plat_cpu_core_present(int core)
  	return true;
  }
  
diff --git a/target/linux/ramips/patches-4.14/998-mt7621-needs-jiffies.patch b/target/linux/ramips/patches-4.14/998-mt7621-needs-jiffies.patch
deleted file mode 100644
index 906f68adb5..0000000000
--- a/target/linux/ramips/patches-4.14/998-mt7621-needs-jiffies.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/arch/mips/ralink/mt7621.c
-+++ b/arch/mips/ralink/mt7621.c
-@@ -9,6 +9,7 @@
- 
- #include <linux/kernel.h>
- #include <linux/init.h>
-+#include <linux/jiffies.h>
- 
- #include <asm/mipsregs.h>
- #include <asm/smp-ops.h>