Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 2 insertions, 6 deletions

diff --git a/init/Kconfig b/init/Kconfig
index ba3a389fab94..da071c4bbfb7 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -496,16 +496,12 @@ source "usr/Kconfig"
 endif
 
 config CC_OPTIMIZE_FOR_SIZE
-        bool "Optimize for size (Look out for broken compilers!)"
+        bool "Optimize for size"
         default y
-        depends on ARM || H8300 || SUPERH || EXPERIMENTAL
         help
           Enabling this option will pass "-Os" instead of "-O2" to gcc
           resulting in a smaller kernel.
 
-          WARNING: some versions of gcc may generate incorrect code with this
-          option.  If problems are observed, a gcc upgrade may be needed.
-
           If unsure, say N.
 
 config SYSCTL
@@ -521,7 +517,7 @@ menuconfig EMBEDDED
 
 config UID16
         bool "Enable 16-bit UID system calls" if EMBEDDED
-        depends on ARM || BLACKFIN || CRIS || FRV || H8300 || X86_32 || M68K || (S390 && !64BIT) || SUPERH || SPARC32 || (SPARC64 && SPARC32_COMPAT) || UML || (X86_64 && IA32_EMULATION)
+        depends on ARM || BLACKFIN || CRIS || FRV || H8300 || X86_32 || M68K || (S390 && !64BIT) || SUPERH || SPARC32 || (SPARC64 && COMPAT) || UML || (X86_64 && IA32_EMULATION)
         default y
         help
           This enables the legacy 16-bit UID syscall wrappers.