Re: [PATCH 04/11] x86/pci: Makefile merge: Decoupling options for mp_bus_to_node.o

From: Yinghai Lu
Date: Wed Jul 02 2008 - 19:39:18 EST


On Wed, Jul 2, 2008 at 1:50 PM, Robert Richter <robert.richter@xxxxxxx> wrote:
> Signed-off-by: Robert Richter <robert.richter@xxxxxxx>
> ---
> arch/x86/pci/Makefile | 6 ++----
> 1 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/arch/x86/pci/Makefile b/arch/x86/pci/Makefile
> index 8491894..d69a0fe 100644
> --- a/arch/x86/pci/Makefile
> +++ b/arch/x86/pci/Makefile
> @@ -14,14 +14,12 @@ pci-y := fixup.o
> # legacy/irq.o
> pci-$(CONFIG_ACPI) += acpi.o
> pci-y += legacy.o irq.o
> +pci-$(CONFIG_NUMA) += mp_bus_to_node.o
>
> # Careful: VISWS and NUMAQ 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 irq.o

looks like you didn't base on latest tip/master...

YH
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/