From: Weijie Gao 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=e217d69a4a9cc0adc327cb3f8773ab8bf7c60124;p=openwrt%2Fstaging%2Fjogo.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 --- 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 + #include ++#include + + #include + #include @@ -16,6 +16,7 @@ #include #include 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 - #include -+#include - - #include - #include