diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2006-10-04 02:17:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 07:55:29 -0700 |
| commit | 03571e11c4a6d08230657f80970f0a5cc7820471 (patch) | |
| tree | 1ee056fff8d00a49f51116932bedf38ea592d038 | |
| parent | 3b7d1921f4cdd6d6ddb7899ae7a8d413991c5cf4 (diff) | |
| download | op-kernel-dev-03571e11c4a6d08230657f80970f0a5cc7820471.zip op-kernel-dev-03571e11c4a6d08230657f80970f0a5cc7820471.tar.gz | |
[PATCH] msi: move the ia64 code into arch/ia64
This is just a few makefile tweaks and some file renames.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Andi Kleen <ak@suse.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Greg KH <greg@kroah.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | arch/ia64/kernel/Makefile | 1 | ||||
| -rw-r--r-- | arch/ia64/kernel/msi_ia64.c (renamed from drivers/pci/msi-apic.c) | 0 | ||||
| -rw-r--r-- | arch/ia64/sn/kernel/Makefile | 1 | ||||
| -rw-r--r-- | arch/ia64/sn/kernel/msi_sn.c (renamed from drivers/pci/msi-altix.c) | 0 | ||||
| -rw-r--r-- | drivers/pci/Makefile | 9 |
5 files changed, 5 insertions, 6 deletions
diff --git a/arch/ia64/kernel/Makefile b/arch/ia64/kernel/Makefile index 3149749..cfa099b 100644 --- a/arch/ia64/kernel/Makefile +++ b/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/drivers/pci/msi-apic.c b/arch/ia64/kernel/msi_ia64.c index 822e59a..822e59a 100644 --- a/drivers/pci/msi-apic.c +++ b/arch/ia64/kernel/msi_ia64.c diff --git a/arch/ia64/sn/kernel/Makefile b/arch/ia64/sn/kernel/Makefile index ab9c48c..2d78f34 100644 --- a/arch/ia64/sn/kernel/Makefile +++ b/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/drivers/pci/msi-altix.c b/arch/ia64/sn/kernel/msi_sn.c index 6ffd1f8..6ffd1f8 100644 --- a/drivers/pci/msi-altix.c +++ b/arch/ia64/sn/kernel/msi_sn.c diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile index 2752c57..04694ec 100644 --- a/drivers/pci/Makefile +++ b/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 # |
