Merge branch 'linus' into x86/x2apic

This commit is contained in:
Ingo Molnar
2008-07-18 22:50:34 +02:00
3697 changed files with 244003 additions and 275846 deletions

View File

@@ -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