public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Adrian Bunk <bunk@kernel.org>
To: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com
Cc: linux-kernel@vger.kernel.org
Subject: [2.6 patch] x86: merge the PCI_MMCONFIG options
Date: Tue, 29 Jan 2008 00:14:43 +0200	[thread overview]
Message-ID: <20080128221443.GK8767@does.not.exist> (raw)

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


                 reply	other threads:[~2008-01-28 22:21 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080128221443.GK8767@does.not.exist \
    --to=bunk@kernel.org \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox