diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:15:58 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:15:58 -0400 |
commit | e765ee90da62535ac7d7a97f2464f9646539d683 (patch) | |
tree | 7a9cecce5aab958938e9a3bf46c2302d6af1958c /arch/x86/Kconfig | |
parent | a4500b84c51645bbc86be3ca84f2252b7ada060f (diff) | |
parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) |
Merge branch 'linus' into tracing/ftrace
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r-- | arch/x86/Kconfig | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index fc86c54e791e..b0937c03af3c 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -28,17 +28,10 @@ config X86 | |||
28 | select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64) | 28 | select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64) |
29 | select HAVE_ARCH_KGDB if !X86_VOYAGER | 29 | select HAVE_ARCH_KGDB if !X86_VOYAGER |
30 | 30 | ||
31 | config DEFCONFIG_LIST | 31 | config ARCH_DEFCONFIG |
32 | string | 32 | string |
33 | depends on X86_32 | 33 | default "arch/x86/configs/i386_defconfig" if X86_32 |
34 | option defconfig_list | 34 | default "arch/x86/configs/x86_64_defconfig" if X86_64 |
35 | default "arch/x86/configs/i386_defconfig" | ||
36 | |||
37 | config DEFCONFIG_LIST | ||
38 | string | ||
39 | depends on X86_64 | ||
40 | option defconfig_list | ||
41 | default "arch/x86/configs/x86_64_defconfig" | ||
42 | 35 | ||
43 | 36 | ||
44 | config GENERIC_LOCKBREAK | 37 | config GENERIC_LOCKBREAK |
@@ -1517,13 +1510,13 @@ config PCI_GOMMCONFIG | |||
1517 | config PCI_GODIRECT | 1510 | config PCI_GODIRECT |
1518 | bool "Direct" | 1511 | bool "Direct" |
1519 | 1512 | ||
1520 | config PCI_GOANY | ||
1521 | bool "Any" | ||
1522 | |||
1523 | config PCI_GOOLPC | 1513 | config PCI_GOOLPC |
1524 | bool "OLPC" | 1514 | bool "OLPC" |
1525 | depends on OLPC | 1515 | depends on OLPC |
1526 | 1516 | ||
1517 | config PCI_GOANY | ||
1518 | bool "Any" | ||
1519 | |||
1527 | endchoice | 1520 | endchoice |
1528 | 1521 | ||
1529 | config PCI_BIOS | 1522 | config PCI_BIOS |
@@ -1540,9 +1533,8 @@ config PCI_MMCONFIG | |||
1540 | depends on X86_32 && PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY) | 1533 | depends on X86_32 && PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY) |
1541 | 1534 | ||
1542 | config PCI_OLPC | 1535 | config PCI_OLPC |
1543 | bool | 1536 | def_bool y |
1544 | depends on PCI && PCI_GOOLPC | 1537 | depends on PCI && OLPC && (PCI_GOOLPC || PCI_GOANY) |
1545 | default y | ||
1546 | 1538 | ||
1547 | config PCI_DOMAINS | 1539 | config PCI_DOMAINS |
1548 | def_bool y | 1540 | def_bool y |