diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-11-12 21:45:40 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-11-12 21:45:40 +0400 |
| commit | f68e76fa868d731b51ebb827224d9b0f54aa7037 (patch) | |
| tree | 83ebb01778647d36d19f52c35b654f6cc55264d6 /init | |
| parent | 59ed7734412167f79f98ec58dc11f869a1db38ba (diff) | |
| parent | 15c3debfd37238963933f57ac571c506a276caf1 (diff) | |
Merge branch 'tracking-linaro-android-3.12' into merge-linux-linaro-core-tracking
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig index 3ecd8a1178f1..e286a87e3e11 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1292,6 +1292,12 @@ config SYSCTL_ARCH_UNALIGN_ALLOW config HAVE_PCSPKR_PLATFORM bool +config PANIC_TIMEOUT + int "Default panic timeout" + default 0 + help + Set default panic timeout. + menuconfig EXPERT bool "Configure standard kernel features (expert users)" # Unhide debug options, to make the on-by-default options visible |