diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-25 15:00:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-25 15:00:27 -0700 |
| commit | b3733034f113a4119f734b84e94180a42c8bc1a1 (patch) | |
| tree | d9eaf50e02a3043ca00a48a99d05d619e76cf6c3 /arch | |
| parent | c8ff99a7c2fb23a0f1165f3821fd66fd65f30264 (diff) | |
| parent | 73531905ed53576d9e8707659a761e7046a60497 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
Kconfig: introduce ARCH_DEFCONFIG to DEFCONFIG_LIST
.gitignore: match ncscope.out
scripts/ver_linux use 'gcc -dumpversion'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/Kconfig | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index fe361ae7ef2..dcbec34154c 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -26,17 +26,10 @@ config X86 select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64) select HAVE_ARCH_KGDB if !X86_VOYAGER -config DEFCONFIG_LIST +config ARCH_DEFCONFIG string - depends on X86_32 - option defconfig_list - default "arch/x86/configs/i386_defconfig" - -config DEFCONFIG_LIST - string - depends on X86_64 - option defconfig_list - default "arch/x86/configs/x86_64_defconfig" + default "arch/x86/configs/i386_defconfig" if X86_32 + default "arch/x86/configs/x86_64_defconfig" if X86_64 config GENERIC_LOCKBREAK |