Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus

[sfrench/cifs-2.6.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 058e3671fa11ecab043f414946ae539b8fadf2ec..f5dbc6d4261bcb47e7d7dccfa6385f649ecefa0a 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -921,7 +921,7 @@ config NUMA_BALANCING_DEFAULT_ENABLED
          machine.
 
 menuconfig CGROUPS
-       boolean "Control Group support"
+       bool "Control Group support"
        select KERNFS
        help
          This option adds support for grouping sets of processes together, for
@@ -1290,8 +1290,8 @@ endif
 config CC_OPTIMIZE_FOR_SIZE
        bool "Optimize for size"
        help
-         Enabling this option will pass "-Os" instead of "-O2" to gcc
-         resulting in a smaller kernel.
+         Enabling this option will pass "-Os" instead of "-O2" to
+         your compiler resulting in a smaller kernel.
 
          If unsure, say N.
 
@@ -1762,7 +1762,7 @@ config SLABINFO
        default y
 
 config RT_MUTEXES
-       boolean
+       bool
 
 config BASE_SMALL
        int