Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied...

[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..62e5ad63181a69c999b61dc40f0e4083c8e1a0ba 100644 (file)
--- a/arch/um/drivers/mconsole_user.c
+++ b/arch/um/drivers/mconsole_user.c
@@ -16,8 +16,7 @@
 #include "user.h"
 #include "sysdep/ptrace.h"
 #include "mconsole.h"
-#include "umid.h"
-#include "user_util.h"
+#include "os.h"
 
 static struct mconsole_command commands[] = {
        /* With uts namespaces, uts information becomes process-specific, so