projects
/
cascardo
/
linux.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/max98357a' into asoc-linus
[cascardo/linux.git]
/
fs
/
proc
/
uptime.c
diff --git
a/fs/proc/uptime.c
b/fs/proc/uptime.c
index
7141b8d
..
33de567
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)
{