From a6ab97fb54068cf002290f0d53f9d89f8051970f Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Wed, 21 Nov 2012 15:34:59 -0500 Subject: [PATCH] --- yaml --- r: 336930 b: refs/heads/master c: 7dc30303342562685392c8c7aa5194e98fd27625 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pci/Makefile | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 8ef6307c0f25..1ce289cc71ac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8ccc9aa17a0ccfabf3b2eb31243c3204f81166f6 +refs/heads/master: 7dc30303342562685392c8c7aa5194e98fd27625 diff --git a/trunk/drivers/pci/Makefile b/trunk/drivers/pci/Makefile index 36f119d9c342..0c3efcffa83b 100644 --- a/trunk/drivers/pci/Makefile +++ b/trunk/drivers/pci/Makefile @@ -4,7 +4,7 @@ obj-y += access.o bus.o probe.o host-bridge.o remove.o pci.o \ pci-driver.o search.o pci-sysfs.o rom.o setup-res.o \ - irq.o vpd.o + irq.o vpd.o setup-bus.o obj-$(CONFIG_PROC_FS) += proc.o obj-$(CONFIG_SYSFS) += slot.o @@ -58,9 +58,6 @@ obj-$(CONFIG_ACPI) += pci-acpi.o # SMBIOS provided firmware instance and labels obj-$(CONFIG_PCI_LABEL) += pci-label.o -# Cardbus & CompactPCI use setup-bus -obj-$(CONFIG_HOTPLUG) += setup-bus.o - obj-$(CONFIG_PCI_SYSCALL) += syscall.o obj-$(CONFIG_PCI_STUB) += pci-stub.o