* [2.6 patch] x86: merge the PCI_MMCONFIG options
@ 2008-01-28 22:14 Adrian Bunk
0 siblings, 0 replies; only message in thread
From: Adrian Bunk @ 2008-01-28 22:14 UTC (permalink / raw)
To: tglx, mingo, hpa; +Cc: linux-kernel
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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2008-01-28 22:21 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-01-28 22:14 [2.6 patch] x86: merge the PCI_MMCONFIG options Adrian Bunk
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.