aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Dunlap2011-04-26 14:33:21 -0500
committerLinus Torvalds2011-04-26 22:48:37 -0500
commit6befe5f69bae9f907e6c85bbfe298e404864092e (patch)
tree40ba3321800dd1225b57af9f570f2bba4af8f0f5 /init/Kconfig
parent4175242c0dc1d92e821d2b45bc8fe06d4650a7b5 (diff)
downloadkernel-6befe5f69bae9f907e6c85bbfe298e404864092e.tar.gz
kernel-6befe5f69bae9f907e6c85bbfe298e404864092e.tar.xz
kernel-6befe5f69bae9f907e6c85bbfe298e404864092e.zip
init/Kconfig: fix EXPERT menu list
The EXPERT menu list was recently broken by the insertion of a kconfig symbol (EMBEDDED) at the beginning of the EXPERT list of kconfig items. Broken by: commit 6a108a14fa356ef607be308b68337939e56ea94e Author: David Rientjes <rientjes@google.com> Date: Thu Jan 20 14:44:16 2011 -0800 kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT Restore the EXPERT menu list -- don't inject a symbol (EMBEDDED) that does not depend on EXPERT into the list. Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Cc: David Rientjes <rientjes@google.com> Cc: Peter Foley <pefoley2@verizon.net> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'init/Kconfig')
-rw-r--r--init/Kconfig16
1 files changed, 8 insertions, 8 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 56240e724d9a..7a71e0a9992a 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -924,14 +924,6 @@ menuconfig EXPERT
924 environments which can tolerate a "non-standard" kernel. 924 environments which can tolerate a "non-standard" kernel.
925 Only use this if you really know what you are doing. 925 Only use this if you really know what you are doing.
926 926
927config EMBEDDED
928 bool "Embedded system"
929 select EXPERT
930 help
931 This option should be enabled if compiling the kernel for
932 an embedded system so certain expert options are available
933 for configuration.
934
935config UID16 927config UID16
936 bool "Enable 16-bit UID system calls" if EXPERT 928 bool "Enable 16-bit UID system calls" if EXPERT
937 depends on ARM || BLACKFIN || CRIS || FRV || H8300 || X86_32 || M68K || (S390 && !64BIT) || SUPERH || SPARC32 || (SPARC64 && COMPAT) || UML || (X86_64 && IA32_EMULATION) 929 depends on ARM || BLACKFIN || CRIS || FRV || H8300 || X86_32 || M68K || (S390 && !64BIT) || SUPERH || SPARC32 || (SPARC64 && COMPAT) || UML || (X86_64 && IA32_EMULATION)
@@ -1104,6 +1096,14 @@ config AIO
1104 by some high performance threaded applications. Disabling 1096 by some high performance threaded applications. Disabling
1105 this option saves about 7k. 1097 this option saves about 7k.
1106 1098
1099config EMBEDDED
1100 bool "Embedded system"
1101 select EXPERT
1102 help
1103 This option should be enabled if compiling the kernel for
1104 an embedded system so certain expert options are available
1105 for configuration.
1106
1107config HAVE_PERF_EVENTS 1107config HAVE_PERF_EVENTS
1108 bool 1108 bool
1109 help 1109 help