On Mon, Feb 03, 2014 at 05:38:36PM +0000, Liviu Dudau wrote: > setup-bus.o is now included unconditionally as of commit > 7dc30303342562685392c8c7aa5194e98fd27625. Remove it from > the per-arch list of object files. > > Signed-off-by: Liviu Dudau <Liviu.Dudau@xxxxxxx> Applied to pci/misc for v3.15, thanks! Bjorn > --- > drivers/pci/Makefile | 22 ++++++++-------------- > 1 file changed, 8 insertions(+), 14 deletions(-) > > diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile > index 17d2b07..e2501ac 100644 > --- a/drivers/pci/Makefile > +++ b/drivers/pci/Makefile > @@ -33,21 +33,15 @@ obj-$(CONFIG_PCI_IOV) += iov.o > # > # Some architectures use the generic PCI setup functions > # > -obj-$(CONFIG_X86) += setup-bus.o > -obj-$(CONFIG_ALPHA) += setup-bus.o setup-irq.o > -obj-$(CONFIG_ARM) += setup-bus.o setup-irq.o > -obj-$(CONFIG_UNICORE32) += setup-bus.o setup-irq.o > -obj-$(CONFIG_PARISC) += setup-bus.o > -obj-$(CONFIG_SUPERH) += setup-bus.o setup-irq.o > -obj-$(CONFIG_PPC) += setup-bus.o > -obj-$(CONFIG_FRV) += setup-bus.o > -obj-$(CONFIG_MIPS) += setup-bus.o setup-irq.o > +obj-$(CONFIG_ALPHA) += setup-irq.o > +obj-$(CONFIG_ARM) += setup-irq.o > +obj-$(CONFIG_UNICORE32) += setup-irq.o > +obj-$(CONFIG_SUPERH) += setup-irq.o > +obj-$(CONFIG_MIPS) += setup-irq.o > obj-$(CONFIG_X86_VISWS) += setup-irq.o > -obj-$(CONFIG_MN10300) += setup-bus.o > -obj-$(CONFIG_MICROBLAZE) += setup-bus.o > -obj-$(CONFIG_TILE) += setup-bus.o setup-irq.o > -obj-$(CONFIG_SPARC_LEON) += setup-bus.o setup-irq.o > -obj-$(CONFIG_M68K) += setup-bus.o setup-irq.o > +obj-$(CONFIG_TILE) += setup-irq.o > +obj-$(CONFIG_SPARC_LEON) += setup-irq.o > +obj-$(CONFIG_M68K) += setup-irq.o > > # > # ACPI Related PCI FW Functions > -- > 1.8.5.3 > -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
