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>
This commit is contained in:
parent
83f08aebb1
commit
e217d69a4a
2 changed files with 8 additions and 10 deletions
|
@ -1,5 +1,13 @@
|
||||||
--- a/arch/mips/ralink/mt7621.c
|
--- a/arch/mips/ralink/mt7621.c
|
||||||
+++ b/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 @@
|
@@ -16,6 +16,7 @@
|
||||||
#include <asm/mach-ralink/ralink_regs.h>
|
#include <asm/mach-ralink/ralink_regs.h>
|
||||||
#include <asm/mach-ralink/mt7621.h>
|
#include <asm/mach-ralink/mt7621.h>
|
||||||
|
|
|
@ -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>
|
|
Loading…
Reference in a new issue