summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorPetr Mladek <pmladek@suse.com>2020-10-12 13:01:37 +0200
committerPetr Mladek <pmladek@suse.com>2020-10-12 13:01:37 +0200
commit70333f4ff9c16dd82a2667080c3ae48fe30a3cb4 (patch)
treedf9a785cca8bd73c1a1962c2cc66b1702d9a4ebd /init
parent4e797e6ec79c0705791c14f3e60f38b01c78ea1d (diff)
parent0463d04ea03a12d8a5aad42197a5945dfd78d7d6 (diff)
downloadlinux-stable-70333f4ff9c16dd82a2667080c3ae48fe30a3cb4.tar.gz
linux-stable-70333f4ff9c16dd82a2667080c3ae48fe30a3cb4.tar.bz2
linux-stable-70333f4ff9c16dd82a2667080c3ae48fe30a3cb4.zip
Merge branch 'printk-rework' into for-linus
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig
index f4bffefdbed5..6edb2d9cdf3f 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -682,7 +682,8 @@ config IKHEADERS
config LOG_BUF_SHIFT
int "Kernel log buffer size (16 => 64KB, 17 => 128KB)"
- range 12 25
+ range 12 25 if !H8300
+ range 12 19 if H8300
default 17
depends on PRINTK
help