Merge branch 'torvalds/master'

[firefly-linux-kernel-4.4.55.git] / arch / um / drivers / mconsole.h

diff --git a/arch/um/drivers/mconsole.h b/arch/um/drivers/mconsole.h
index 8b22535c62ceb71e84276a14ef14f385f6f643d8..44af7379ea19c3da2cc4eb261287d8cab3ddfa16 100644 (file)
--- a/arch/um/drivers/mconsole.h
+++ b/arch/um/drivers/mconsole.h
@@ -7,7 +7,7 @@
 #ifndef __MCONSOLE_H__
 #define __MCONSOLE_H__
 
-#ifndef __KERNEL__
+#ifdef __UM_HOST__
 #include <stdint.h>
 #define u32 uint32_t
 #endif