Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03571e11 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Linus Torvalds
Browse files

[PATCH] msi: move the ia64 code into arch/ia64 



This is just a few makefile tweaks and some file renames.

Signed-off-by: default avatarEric 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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 3b7d1921

arch/ia64/kernel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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

drivers/pci/msi-apic.c→arch/ia64/kernel/msi_ia64.c

+0 −0

File moved.

View file

arch/ia64/sn/kernel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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

drivers/pci/msi-altix.c→arch/ia64/sn/kernel/msi_sn.c

+0 −0

File moved.

View file

drivers/pci/Makefile

+3 −6
Original line number Diff line number Diff line
@@ -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

#