diff options
author | Colin Cross <ccross@android.com> | 2011-06-29 13:54:42 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2011-06-29 13:54:42 -0700 |
commit | e55d4fa96762fd767a3b6d842c904e994db6bb2e (patch) | |
tree | c74157e01cb128cb97f106a50cfadc4c8b872c41 /init/Kconfig | |
parent | e32c14667e4fe9f16ac9b918d15d29abd2315a55 (diff) | |
parent | b0af8dfdd67699e25083478c63eedef2e72ebd85 (diff) | |
download | kernel_samsung_espresso10-e55d4fa96762fd767a3b6d842c904e994db6bb2e.zip kernel_samsung_espresso10-e55d4fa96762fd767a3b6d842c904e994db6bb2e.tar.gz kernel_samsung_espresso10-e55d4fa96762fd767a3b6d842c904e994db6bb2e.tar.bz2 |
Merge commit 'v3.0-rc5' into android-3.0
Diffstat (limited to 'init/Kconfig')
-rw-r--r-- | init/Kconfig | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig index 9d2a378..4fe9168 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -19,7 +19,6 @@ config DEFCONFIG_LIST config CONSTRUCTORS bool depends on !UML - default y config HAVE_IRQ_WORK bool @@ -204,6 +203,15 @@ config KERNEL_LZO endchoice +config DEFAULT_HOSTNAME + string "Default hostname" + default "(none)" + help + This option determines the default system hostname before userspace + calls sethostname(2). The kernel traditionally uses "(none)" here, + but you may wish to use a different default here to make a minimal + system more usable with less configuration. + config SWAP bool "Support for paging of anonymous memory (swap)" depends on MMU && BLOCK |