diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2012-03-23 21:43:21 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2012-03-23 21:43:21 -0700 |
| commit | 9c6641224bdc2957f1d4ef692f027ff5e0fcc63b (patch) | |
| tree | 589c55d8a24b79a5cfd2cb3379d1ce0cac9c7464 /init | |
| parent | c9134a33b3936ca9cae8bdc6dccd77e9c294f0ef (diff) | |
| parent | 5275e74ae5e7e92b05bd1361e2573bb38d381358 (diff) | |
Merge commit '5275e74' into after-upstream-android
Conflicts:
arch/arm/common/Kconfig
arch/arm/mm/Makefile
arch/arm/mm/cache-l2x0.c
drivers/misc/Kconfig
drivers/misc/Makefile
drivers/mmc/core/core.c
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
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 3f42cd66f0f8..34f07be2f9da 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -962,6 +962,12 @@ config SYSCTL config ANON_INODES 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 |