From 95bb831c19d99df99d8593ade858f70f6249d9d4 Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" Date: Wed, 4 Oct 2006 02:17:00 -0700 Subject: [PATCH] --- yaml --- r: 38440 b: refs/heads/master c: 03571e11c4a6d08230657f80970f0a5cc7820471 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/ia64/kernel/Makefile | 1 + .../pci/msi-apic.c => arch/ia64/kernel/msi_ia64.c} | 0 trunk/arch/ia64/sn/kernel/Makefile | 1 + .../pci/msi-altix.c => arch/ia64/sn/kernel/msi_sn.c} | 0 trunk/drivers/pci/Makefile | 9 +++------ 6 files changed, 6 insertions(+), 7 deletions(-) rename trunk/{drivers/pci/msi-apic.c => arch/ia64/kernel/msi_ia64.c} (100%) rename trunk/{drivers/pci/msi-altix.c => arch/ia64/sn/kernel/msi_sn.c} (100%) diff --git a/[refs] b/[refs] index 844e2a23f0b7..4cbb803bc14b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3b7d1921f4cdd6d6ddb7899ae7a8d413991c5cf4 +refs/heads/master: 03571e11c4a6d08230657f80970f0a5cc7820471 diff --git a/trunk/arch/ia64/kernel/Makefile b/trunk/arch/ia64/kernel/Makefile index 31497496eb4b..cfa099b04cda 100644 --- a/trunk/arch/ia64/kernel/Makefile +++ b/trunk/arch/ia64/kernel/Makefile @@ -30,6 +30,7 @@ obj-$(CONFIG_IA64_MCA_RECOVERY) += mca_recovery.o obj-$(CONFIG_KPROBES) += kprobes.o jprobes.o obj-$(CONFIG_IA64_UNCACHED_ALLOCATOR) += uncached.o obj-$(CONFIG_AUDIT) += audit.o +obj-$(CONFIG_PCI_MSI) += msi_ia64.o mca_recovery-y += mca_drv.o mca_drv_asm.o obj-$(CONFIG_IA64_ESI) += esi.o diff --git a/trunk/drivers/pci/msi-apic.c b/trunk/arch/ia64/kernel/msi_ia64.c similarity index 100% rename from trunk/drivers/pci/msi-apic.c rename to trunk/arch/ia64/kernel/msi_ia64.c diff --git a/trunk/arch/ia64/sn/kernel/Makefile b/trunk/arch/ia64/sn/kernel/Makefile index ab9c48c88012..2d78f34dd763 100644 --- a/trunk/arch/ia64/sn/kernel/Makefile +++ b/trunk/arch/ia64/sn/kernel/Makefile @@ -19,3 +19,4 @@ xp-y := xp_main.o xp_nofault.o obj-$(CONFIG_IA64_SGI_SN_XP) += xpc.o xpc-y := xpc_main.o xpc_channel.o xpc_partition.o obj-$(CONFIG_IA64_SGI_SN_XP) += xpnet.o +obj-$(CONFIG_PCI_MSI) += msi_sn.o diff --git a/trunk/drivers/pci/msi-altix.c b/trunk/arch/ia64/sn/kernel/msi_sn.c similarity index 100% rename from trunk/drivers/pci/msi-altix.c rename to trunk/arch/ia64/sn/kernel/msi_sn.c diff --git a/trunk/drivers/pci/Makefile b/trunk/drivers/pci/Makefile index 2752c57ecf01..04694ec7224b 100644 --- a/trunk/drivers/pci/Makefile +++ b/trunk/drivers/pci/Makefile @@ -14,6 +14,9 @@ obj-$(CONFIG_HOTPLUG) += hotplug.o # Build the PCI Hotplug drivers if we were asked to obj-$(CONFIG_HOTPLUG_PCI) += hotplug/ +# Build the PCI MSI interrupt support +obj-$(CONFIG_PCI_MSI) += msi.o + # # Some architectures use the generic PCI setup functions # @@ -28,12 +31,6 @@ obj-$(CONFIG_MIPS) += setup-bus.o setup-irq.o obj-$(CONFIG_X86_VISWS) += setup-irq.o obj-$(CONFIG_HT_IRQ) += htirq.o -msiobj-y := msi.o -msiobj-$(CONFIG_IA64) += msi-apic.o -msiobj-$(CONFIG_IA64_GENERIC) += msi-altix.o -msiobj-$(CONFIG_IA64_SGI_SN2) += msi-altix.o -obj-$(CONFIG_PCI_MSI) += $(msiobj-y) - # # ACPI Related PCI FW Functions #