diff options
| author | Colin Cross <ccross@android.com> | 2011-06-22 15:35:38 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-06-22 15:35:38 -0700 |
| commit | 0a7e36012f4af64b18bbdbbf4aa4e25e79ecb1b3 (patch) | |
| tree | c37a1fbf8b718b058197f6bdbba9bd8c55b86461 /init/Kconfig | |
| parent | 527d5ce86899f02b5d1ff5d48423a57271878c7a (diff) | |
| parent | 2932297a0c52322929092e3c2443fbe59c42ee2b (diff) | |
| download | kernel_samsung_tuna-0a7e36012f4af64b18bbdbbf4aa4e25e79ecb1b3.zip kernel_samsung_tuna-0a7e36012f4af64b18bbdbbf4aa4e25e79ecb1b3.tar.gz kernel_samsung_tuna-0a7e36012f4af64b18bbdbbf4aa4e25e79ecb1b3.tar.bz2 | |
Merge branch 'linux-omap-3.0' into android-omap-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 |