aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorWeijie Gao <hackpascal@gmail.com>2018-11-18 23:49:23 +0800
committerJohn Crispin <john@phrozen.org>2018-11-26 12:13:52 +0100
commite217d69a4a9cc0adc327cb3f8773ab8bf7c60124 (patch)
treeabe4da65d91d742cc1007f4f889904e81af20380 /target/linux
parent83f08aebb14c0bdcd3f6898fb8e93b76e69767de (diff)
downloadupstream-e217d69a4a9cc0adc327cb3f8773ab8bf7c60124.tar.gz
upstream-e217d69a4a9cc0adc327cb3f8773ab8bf7c60124.tar.bz2
upstream-e217d69a4a9cc0adc327cb3f8773ab8bf7c60124.zip
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>
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/ramips/patches-4.14/101-mt7621-timer.patch8
-rw-r--r--target/linux/ramips/patches-4.14/998-mt7621-needs-jiffies.patch10
2 files changed, 8 insertions, 10 deletions
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..5bbe137f1e 100644
--- a/target/linux/ramips/patches-4.14/101-mt7621-timer.patch
+++ b/target/linux/ramips/patches-4.14/101-mt7621-timer.patch
@@ -1,5 +1,13 @@
--- 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>
@@ -16,6 +16,7 @@
#include <asm/mach-ralink/ralink_regs.h>
#include <asm/mach-ralink/mt7621.h>
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>