diff options
| author |   Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 22:20:12 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 22:20:12 -0500 |
| commit | c6329f4df2263ab5a40601a5236639e61b682f51 (patch) | |
| tree | 1ae9f8a5d65c8fcb87bf13c82ff09df641c3d418 /init | |
| parent | [PATCH] add boot option to control Intel SATA/PATA combined mode (diff) | |
| parent | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 (diff) | |
| download | linux-dev-c6329f4df2263ab5a40601a5236639e61b682f51.tar.xz linux-dev-c6329f4df2263ab5a40601a5236639e61b682f51.zip | |
Merge branch 'master'
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/init/Kconfig b/init/Kconfig index ea097e0a9c02..be74adb389ea 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -206,7 +206,7 @@ config HOTPLUG outside the kernel tree does. Such modules require Y here. config KOBJECT_UEVENT - bool "Kernel Userspace Events" + bool "Kernel Userspace Events" if EMBEDDED depends on NET default y help @@ -339,7 +339,7 @@ config EPOLL support for epoll family of system calls. config CC_OPTIMIZE_FOR_SIZE - bool "Optimize for size" if EMBEDDED + bool "Optimize for size" default y if ARM || H8300 help Enabling this option will pass "-Os" instead of "-O2" to gcc |