From: Greg KH <greg@kroah.com>
To: linux-kernel@vger.kernel.org
Subject: Re: [PATCH] PCI fixes for 2.5.73
Date: Mon, 23 Jun 2003 16:59:25 -0700 [thread overview]
Message-ID: <20030623235925.GD12207@kroah.com> (raw)
In-Reply-To: <20030623235919.GC12207@kroah.com>
ChangeSet 1.1348.14.3, 2003/06/23 14:44:35-07:00, willy@debian.org
[PATCH] PCI: unconfuse arch/i386/pci/Makefile
I was looking in this Makefile for link order when my head began to hurt.
Apparently you can't have both NUMAQ and VISWS selected, so getting rid
of all the ifdefs/ifndefs like this should work.
arch/i386/pci/Makefile | 28 +++++++---------------------
1 files changed, 7 insertions(+), 21 deletions(-)
diff -Nru a/arch/i386/pci/Makefile b/arch/i386/pci/Makefile
--- a/arch/i386/pci/Makefile Mon Jun 23 16:53:57 2003
+++ b/arch/i386/pci/Makefile Mon Jun 23 16:53:57 2003
@@ -1,27 +1,13 @@
-obj-y := i386.o
+obj-y := i386.o
obj-$(CONFIG_PCI_BIOS) += pcbios.o
obj-$(CONFIG_PCI_DIRECT) += direct.o
-obj-$(CONFIG_X86_VISWS) += visws.o
+pci-y := fixup.o
+pci-$(CONFIG_ACPI_PCI) += acpi.o
+pci-y += legacy.o irq.o
-ifdef CONFIG_X86_NUMAQ
-obj-y += numa.o
-else
-obj-y += fixup.o
+pci-$(CONFIG_X86_VISWS) := visws.o fixup.o
+pci-$(CONFIG_X86_NUMAQ) := numa.o irq.o
-ifdef CONFIG_ACPI_PCI
-obj-y += acpi.o
-endif
-
-ifndef CONFIG_X86_VISWS
-obj-y += legacy.o
-endif
-
-endif # CONFIG_X86_NUMAQ
-
-ifndef CONFIG_X86_VISWS
-obj-y += irq.o
-endif
-
-obj-y += common.o
+obj-y += $(pci-y) common.o
next prev parent reply other threads:[~2003-06-23 23:48 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-06-23 23:58 [BK PATCH] PCI fixes for 2.5.73 Greg KH
2003-06-23 23:59 ` [PATCH] " Greg KH
2003-06-23 23:59 ` Greg KH
2003-06-23 23:59 ` Greg KH [this message]
2003-06-23 23:59 ` Greg KH
2003-06-23 23:59 ` Greg KH
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=20030623235925.GD12207@kroah.com \
--to=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
/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