Merge branch 'linus' into x86/x2apic
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
# Makefile for the PCI bus specific drivers.
|
||||
#
|
||||
|
||||
obj-y += access.o bus.o probe.o remove.o pci.o quirks.o \
|
||||
obj-y += access.o bus.o probe.o remove.o pci.o quirks.o slot.o \
|
||||
pci-driver.o search.o pci-sysfs.o rom.o setup-res.o
|
||||
obj-$(CONFIG_PROC_FS) += proc.o
|
||||
|
||||
|
Reference in New Issue
Block a user