x86: merge the PCI_MMCONFIG options

PATCH New Adrian Bunk 1 participant 1 message Jan 28, 2008 x86

lore

Share & tools

lore

Adrian Bunk

author

2008-01-28 22:21 UTC #0 lore raw

PATCH 1/1 x86: merge the PCI_MMCONFIG options

This patch merges the 32bit and 64bit PCI_MMCONFIG options.

Signed-off-by Adrian Bunk <[email protected]>

---

 arch/x86/Kconfig |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

d9ab553b1bb27c0824dd40516f0ba4ba48a63519

arch/x86/Kconfig +4 -7

index 0e6e74d..7a9261f 100644
@@ -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