From: Robert Richter <robert.richter@amd.com>
To: Ingo Molnar <mingo@elte.hu>, Thomas Gleixner <tglx@linutronix.de>
Cc: LKML <linux-kernel@vger.kernel.org>,
Robert Richter <robert.richter@amd.com>
Subject: [PATCH 2/5] x86/pci: Makefile merge: Changing 32bit ordering
Date: Thu, 10 Jul 2008 18:58:23 +0200 [thread overview]
Message-ID: <1215709106-9182-3-git-send-email-robert.richter@amd.com> (raw)
In-Reply-To: <1215709106-9182-1-git-send-email-robert.richter@amd.com>
This should be save since VISWS and NUMAQ exclud each other.
Signed-off-by: Robert Richter <robert.richter@amd.com>
---
arch/x86/pci/Makefile | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/arch/x86/pci/Makefile b/arch/x86/pci/Makefile
index 99d9f09..2a08d2d 100644
--- a/arch/x86/pci/Makefile
+++ b/arch/x86/pci/Makefile
@@ -8,12 +8,11 @@ obj-$(CONFIG_PCI_OLPC) += olpc.o
pci-y := fixup.o
pci-$(CONFIG_ACPI) += acpi.o
pci-y += legacy.o irq.o
+pci-$(CONFIG_X86_NUMAQ) += numa.o
# Careful: VISWS overrule the pci-y above. The colons are
# therefor correct. This needs a proper fix by distangling the code.
pci-$(CONFIG_X86_VISWS) := visws.o fixup.o
-pci-$(CONFIG_X86_NUMAQ) += numa.o
-
obj-y += $(pci-y) common.o early.o
obj-y += amd_bus.o
--
1.5.5.4
next prev parent reply other threads:[~2008-07-10 17:01 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-10 16:58 [PATCH 0/5] x86/pci: patches for tip/x86/unify-pci Robert Richter
2008-07-10 16:58 ` [PATCH 1/5] x86/pci: Fix build error for X86_VISWS Robert Richter
2008-07-10 16:58 ` Robert Richter [this message]
2008-07-10 16:58 ` [PATCH 3/5] x86/pci merge: Fixing numaq initialization Robert Richter
2008-07-10 17:51 ` Yinghai Lu
2008-07-10 16:58 ` [PATCH 4/5] x86/pci: Fix warnings in subsys_initcall functions Robert Richter
2008-07-10 16:58 ` [PATCH 5/5] x86: build fix for "x86: fix C1E && nx6325 stability problem" Robert Richter
2008-07-10 17:17 ` [PATCH 0/5] x86/pci: patches for tip/x86/unify-pci Ingo Molnar
2008-07-10 18:12 ` Ingo Molnar
2008-07-10 19:52 ` Sam Ravnborg
2008-07-10 19:54 ` Ingo Molnar
2008-07-11 8:20 ` Robert Richter
2008-07-11 10:22 ` Sam Ravnborg
2008-07-11 10:23 ` Ingo Molnar
2008-07-11 10:28 ` Sam Ravnborg
2008-07-11 8:43 ` Robert Richter
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=1215709106-9182-3-git-send-email-robert.richter@amd.com \
--to=robert.richter@amd.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--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 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.