Merge branch 'pci/greg-m68k' into next (cfeeb34b) · Commits · 戴 / test

drivers/pci/Makefile

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -49,6 +49,7 @@ obj-$(CONFIG_MN10300) += setup-bus.o
	obj-$(CONFIG_MICROBLAZE) += setup-bus.o		obj-$(CONFIG_MICROBLAZE) += setup-bus.o
	obj-$(CONFIG_TILE) += setup-bus.o setup-irq.o		obj-$(CONFIG_TILE) += setup-bus.o setup-irq.o
	obj-$(CONFIG_SPARC_LEON) += 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

	#		#
	# ACPI Related PCI FW Functions		# ACPI Related PCI FW Functions