diff options
| author | Randy Dunlap <randy.dunlap@oracle.com> | 2011-04-26 12:33:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-26 20:48:37 -0700 |
| commit | 6befe5f69bae9f907e6c85bbfe298e404864092e (patch) | |
| tree | 40ba3321800dd1225b57af9f570f2bba4af8f0f5 /init/Kconfig | |
| parent | 4175242c0dc1d92e821d2b45bc8fe06d4650a7b5 (diff) | |
| download | linux-3.10-6befe5f69bae9f907e6c85bbfe298e404864092e.tar.gz linux-3.10-6befe5f69bae9f907e6c85bbfe298e404864092e.tar.bz2 linux-3.10-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/Kconfig | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/init/Kconfig b/init/Kconfig index 56240e724d9..7a71e0a9992 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -924,14 +924,6 @@ menuconfig EXPERT environments which can tolerate a "non-standard" kernel. Only use this if you really know what you are doing. -config EMBEDDED - bool "Embedded system" - select EXPERT - help - This option should be enabled if compiling the kernel for - an embedded system so certain expert options are available - for configuration. - config UID16 bool "Enable 16-bit UID system calls" if EXPERT 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 by some high performance threaded applications. Disabling this option saves about 7k. +config EMBEDDED + bool "Embedded system" + select EXPERT + help + This option should be enabled if compiling the kernel for + an embedded system so certain expert options are available + for configuration. + config HAVE_PERF_EVENTS bool help |