diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-09-27 23:24:53 +0200 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-09-27 23:24:53 +0200 |
| commit | 0455029bea7da2a2a92003238c9617a36d5d48fd (patch) | |
| tree | 5dd4935db441dd443f38846236a8b353c9a92da1 /arch/x86/Kconfig | |
| parent | 8c41e5e363db55d91aa3b1cdce4ab02ad9821de7 (diff) | |
| parent | 838a2e55e6a4e9e8a10451ed2ef0f7a08dabdb04 (diff) | |
Merge branch 'kbuild/kconfig/kbuild-generic-v7' of http://github.com/lacombar/linux-2.6 into kbuild/kconfig
* 'kbuild/kconfig/kbuild-generic-v7' of http://github.com/lacombar/linux-2.6:
kbuild: migrate all arch to the kconfig mainmenu upgrade
kconfig: expand file names
kconfig: use the file's name of sourced file
kconfig: constify file name
kconfig: don't emit warning upon rootmenu's prompt redefinition
kconfig: replace KERNELVERSION usage by the mainmenu's prompt
kconfig: delay gconf window initialization
kconfig: expand by default the rootmenu's prompt
kconfig: add a symbol string expansion helper
kconfig: regen parser
kconfig: implement the `mainmenu' directive
kconfig: allow PACKAGE to be defined on the compiler's command-line
kconfig: rephrase help texts/comments not to include the package name
kconfig: allow build-time definition of the internal config prefix
kconfig: rephrase help text not to mention the internal prefix
kconfig: replace a `switch()' statement by a more flexible `if()' statement
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index dcb0593b4a66..6c30b9e93d8c 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1,6 +1,3 @@ -# x86 configuration -mainmenu "Linux Kernel Configuration for x86" - # Select 32 or 64 bit config 64BIT bool "64-bit kernel" if ARCH = "x86" |