projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
[firefly-linux-kernel-4.4.55.git]
/
fs
/
proc
/
uptime.c
diff --git
a/fs/proc/uptime.c
b/fs/proc/uptime.c
index 7141b8d0ca9ed9800afb1ae87def5f8aa06b8f46..33de567c25af4b04a6ba283caaf5e4f6d9b4ecdb 100644
(file)
--- a/
fs/proc/uptime.c
+++ b/
fs/proc/uptime.c
@@
-5,7
+5,7
@@
#include <linux/seq_file.h>
#include <linux/time.h>
#include <linux/kernel_stat.h>
-#include <
asm
/cputime.h>
+#include <
linux
/cputime.h>
static int uptime_proc_show(struct seq_file *m, void *v)
{