From patchwork Mon Nov 19 18:19:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bill Pemberton X-Patchwork-Id: 200113 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id BC4A32C0081 for ; Tue, 20 Nov 2012 05:39:23 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754459Ab2KSSjP (ORCPT ); Mon, 19 Nov 2012 13:39:15 -0500 Received: from viridian.itc.Virginia.EDU ([128.143.12.139]:41697 "EHLO viridian.itc.virginia.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754053Ab2KSSiF (ORCPT ); Mon, 19 Nov 2012 13:38:05 -0500 Received: by viridian.itc.virginia.edu (Postfix, from userid 1249) id D74FB8020E; Mon, 19 Nov 2012 13:27:23 -0500 (EST) From: Bill Pemberton To: gregkh@linuxfoundation.org Cc: linux-pci@vger.kernel.org Subject: [PATCH 016/493] PCI: always build setup-bus when PCI is enabled Date: Mon, 19 Nov 2012 13:19:25 -0500 Message-Id: <1353349642-3677-16-git-send-email-wfp5p@virginia.edu> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1353349642-3677-1-git-send-email-wfp5p@virginia.edu> References: <1353349642-3677-1-git-send-email-wfp5p@virginia.edu> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org CONFIG_HOTPLUG is being removed so setup-bus always needs to be built as part of PCI. Signed-off-by: Bill Pemberton Cc: linux-pci@vger.kernel.org --- drivers/pci/Makefile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile index 36f119d..0c3efcf 100644 --- a/drivers/pci/Makefile +++ b/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