diff options
| author | Petr Mladek <pmladek@suse.com> | 2020-06-01 10:13:51 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2020-06-01 10:13:51 +0200 |
| commit | 6a0af9fc8ccef5304ef88dc7e27362732e047076 (patch) | |
| tree | 000831934293ac650dfec3b382f68dffb189240f /include | |
| parent | e8cc2b97ca5aa12152c302b2f5d41d125e55ab1f (diff) | |
| parent | 33225d7b0ac9903c5701bbede7dfdaeba74ad6c3 (diff) | |
Merge branch 'for-5.7-preferred-console' into for-linus
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/console.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/console.h b/include/linux/console.h index d09951d5a94e..72141f71c014 100644 --- a/include/linux/console.h +++ b/include/linux/console.h @@ -135,7 +135,7 @@ static inline int con_debug_leave(void) */ #define CON_PRINTBUFFER (1) -#define CON_CONSDEV (2) /* Last on the command line */ +#define CON_CONSDEV (2) /* Preferred console, /dev/console */ #define CON_ENABLED (4) #define CON_BOOT (8) #define CON_ANYTIME (16) /* Safe to call when cpu is offline */ |
