projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
[linux-drm-fsl-dcu.git]
/
arch
/
um
/
drivers
/
mconsole_user.c
diff --git
a/arch/um/drivers/mconsole_user.c
b/arch/um/drivers/mconsole_user.c
index 75aef6f7ef6e22dd9669f55f707021cd4f539d10..f02634fbf32ad0e95be61d11c7d911f11a318cd0 100644
(file)
--- a/
arch/um/drivers/mconsole_user.c
+++ b/
arch/um/drivers/mconsole_user.c
@@
-16,7
+16,7
@@
#include "user.h"
#include "sysdep/ptrace.h"
#include "mconsole.h"
-#include "
umid
.h"
+#include "
os
.h"
#include "user_util.h"
static struct mconsole_command commands[] = {