public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Matthew Wilcox <matthew@wil.cx>
To: Mark Maule <maule@sgi.com>
Cc: linux-kernel@vger.kernel.org, linux-ia64@vger.kernel.org,
	gregkh@suse.de, akpm@osdl.org, j-nomura@ce.jp.nec.com
Subject: Re: [PATCH 2.6.16-rc6-mm1] fix ia64 MSI build problems
Date: Mon, 20 Mar 2006 12:44:41 -0700	[thread overview]
Message-ID: <20060320194441.GK8980@parisc-linux.org> (raw)
In-Reply-To: <20060320193638.GH31238@sgi.com>

On Mon, Mar 20, 2006 at 01:36:38PM -0600, Mark Maule wrote:
> Index: maule/drivers/pci/Makefile
> ===================================================================
> --- maule.orig/drivers/pci/Makefile	2006-03-20 11:07:30.602099680 -0600
> +++ maule/drivers/pci/Makefile	2006-03-20 11:08:08.130604825 -0600
> @@ -26,7 +26,19 @@
>  obj-$(CONFIG_PPC64) += setup-bus.o
>  obj-$(CONFIG_MIPS) += setup-bus.o setup-irq.o
>  obj-$(CONFIG_X86_VISWS) += setup-irq.o
> -obj-$(CONFIG_PCI_MSI) += msi.o msi-apic.o
> +
> +ifdef CONFIG_PCI_MSI
> +obj-y += msi.o msi-apic.o
> +
> +ifdef CONFIG_IA64_GENERIC
> +obj-y += msi-altix.o
> +else
> +ifdef CONFIG_IA64_SGI_SN2
> +obj-y += msi-altix.o
> +endif
> +endif
> +
> +endif #CONFIG_PCI_MSI

The right way to do this kind of Makefile jiggery-pokery is:

msi-y := msi.o msi-apic.o
msi-$(CONFIG_IA64_GENERIC) += msi-altix.o
msi-$(CONFIG_IA64_SGI_SN2) += msi-altix.o
obj-$(CONFIG_PCI_MSI) += $(msi-y)

yay for declarative programming ;-)

  reply	other threads:[~2006-03-20 19:44 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-03-20 19:36 [PATCH 2.6.16-rc6-mm1] fix ia64 MSI build problems Mark Maule
2006-03-20 19:44 ` Matthew Wilcox [this message]
2006-03-20 19:54 ` Greg KH
2006-03-20 20:13   ` Mark Maule

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=20060320194441.GK8980@parisc-linux.org \
    --to=matthew@wil.cx \
    --cc=akpm@osdl.org \
    --cc=gregkh@suse.de \
    --cc=j-nomura@ce.jp.nec.com \
    --cc=linux-ia64@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=maule@sgi.com \
    /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