Messages in this thread Patch in this message | | | Date | Tue, 29 Jan 2008 00:14:43 +0200 | From | Adrian Bunk <> | Subject | [2.6 patch] x86: merge the PCI_MMCONFIG options |
| |
This patch merges the 32bit and 64bit PCI_MMCONFIG options.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
---
arch/x86/Kconfig | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
d9ab553b1bb27c0824dd40516f0ba4ba48a63519 diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 0e6e74d..7a9261f 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1429,19 +1429,16 @@ config PCI_DIRECT default y config PCI_MMCONFIG - bool - depends on X86_32 && PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY) - default y + bool "Support mmconfig PCI config space access" if X86_64 + depends on PCI && ACPI + depends on X86_64 || (X86_32 && (PCI_GOMMCONFIG || PCI_GOANY)) + default y if X86_32 config PCI_DOMAINS bool depends on PCI default y -config PCI_MMCONFIG - bool "Support mmconfig PCI config space access" - depends on X86_64 && PCI && ACPI - config DMAR bool "Support for DMA Remapping Devices (EXPERIMENTAL)" depends on X86_64 && PCI_MSI && ACPI && EXPERIMENTAL
| |