aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2006-10-04 05:17:00 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-04 10:55:29 -0400
commit03571e11c4a6d08230657f80970f0a5cc7820471 (patch)
tree1ee056fff8d00a49f51116932bedf38ea592d038
parent3b7d1921f4cdd6d6ddb7899ae7a8d413991c5cf4 (diff)
[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/Makefile1
-rw-r--r--arch/ia64/kernel/msi_ia64.c (renamed from drivers/pci/msi-apic.c)0
-rw-r--r--arch/ia64/sn/kernel/Makefile1
-rw-r--r--arch/ia64/sn/kernel/msi_sn.c (renamed from drivers/pci/msi-altix.c)0
-rw-r--r--drivers/pci/Makefile9
5 files changed, 5 insertions, 6 deletions
diff --git a/arch/ia64/kernel/Makefile b/arch/ia64/kernel/Makefile
index 31497496eb4b..cfa099b04cda 100644
--- a/arch/ia64/kernel/Makefile
+++ b/arch/ia64/kernel/Makefile
@@ -30,6 +30,7 @@ obj-$(CONFIG_IA64_MCA_RECOVERY) += mca_recovery.o
30obj-$(CONFIG_KPROBES) += kprobes.o jprobes.o 30obj-$(CONFIG_KPROBES) += kprobes.o jprobes.o
31obj-$(CONFIG_IA64_UNCACHED_ALLOCATOR) += uncached.o 31obj-$(CONFIG_IA64_UNCACHED_ALLOCATOR) += uncached.o
32obj-$(CONFIG_AUDIT) += audit.o 32obj-$(CONFIG_AUDIT) += audit.o
33obj-$(CONFIG_PCI_MSI) += msi_ia64.o
33mca_recovery-y += mca_drv.o mca_drv_asm.o 34mca_recovery-y += mca_drv.o mca_drv_asm.o
34 35
35obj-$(CONFIG_IA64_ESI) += esi.o 36obj-$(CONFIG_IA64_ESI) += esi.o
diff --git a/drivers/pci/msi-apic.c b/arch/ia64/kernel/msi_ia64.c
index 822e59a1b822..822e59a1b822 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 ab9c48c88012..2d78f34dd763 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
19obj-$(CONFIG_IA64_SGI_SN_XP) += xpc.o 19obj-$(CONFIG_IA64_SGI_SN_XP) += xpc.o
20xpc-y := xpc_main.o xpc_channel.o xpc_partition.o 20xpc-y := xpc_main.o xpc_channel.o xpc_partition.o
21obj-$(CONFIG_IA64_SGI_SN_XP) += xpnet.o 21obj-$(CONFIG_IA64_SGI_SN_XP) += xpnet.o
22obj-$(CONFIG_PCI_MSI) += msi_sn.o
diff --git a/drivers/pci/msi-altix.c b/arch/ia64/sn/kernel/msi_sn.c
index 6ffd1f850d41..6ffd1f850d41 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 2752c57ecf01..04694ec7224b 100644
--- a/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@ -14,6 +14,9 @@ obj-$(CONFIG_HOTPLUG) += hotplug.o
14# Build the PCI Hotplug drivers if we were asked to 14# Build the PCI Hotplug drivers if we were asked to
15obj-$(CONFIG_HOTPLUG_PCI) += hotplug/ 15obj-$(CONFIG_HOTPLUG_PCI) += hotplug/
16 16
17# Build the PCI MSI interrupt support
18obj-$(CONFIG_PCI_MSI) += msi.o
19
17# 20#
18# Some architectures use the generic PCI setup functions 21# Some architectures use the generic PCI setup functions
19# 22#
@@ -28,12 +31,6 @@ obj-$(CONFIG_MIPS) += setup-bus.o setup-irq.o
28obj-$(CONFIG_X86_VISWS) += setup-irq.o 31obj-$(CONFIG_X86_VISWS) += setup-irq.o
29obj-$(CONFIG_HT_IRQ) += htirq.o 32obj-$(CONFIG_HT_IRQ) += htirq.o
30 33
31msiobj-y := msi.o
32msiobj-$(CONFIG_IA64) += msi-apic.o
33msiobj-$(CONFIG_IA64_GENERIC) += msi-altix.o
34msiobj-$(CONFIG_IA64_SGI_SN2) += msi-altix.o
35obj-$(CONFIG_PCI_MSI) += $(msiobj-y)
36
37# 34#
38# ACPI Related PCI FW Functions 35# ACPI Related PCI FW Functions
39# 36#