Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752782AbZFRAqU (ORCPT ); Wed, 17 Jun 2009 20:46:20 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751218AbZFRAqL (ORCPT ); Wed, 17 Jun 2009 20:46:11 -0400 Received: from g4t0014.houston.hp.com ([15.201.24.17]:45120 "EHLO g4t0014.houston.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751133AbZFRAqK (ORCPT ); Wed, 17 Jun 2009 20:46:10 -0400 Date: Wed, 17 Jun 2009 18:46:12 -0600 From: Alex Chiang To: Jesse Barnes Cc: Randy Dunlap , Matthew Wilcox , Stephen Rothwell , linux-next@vger.kernel.org, LKML , "linux-pci@vger.kernel.org" , a.beregalov@gmail.com Subject: Re: linux-next: Tree for June 17 (pci/slot) Message-ID: <20090618004612.GB29472@ldl.fc.hp.com> References: <20090617155354.075c60ae.sfr@canb.auug.org.au> <4A39194B.2060200@oracle.com> <20090617163604.GT19977@parisc-linux.org> <20090617102901.6e39aac2@jbarnes-g45> <4A392B48.7060206@oracle.com> <20090617161001.734321be@jbarnes-g45> <20090618003808.GA29472@ldl.fc.hp.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20090618003808.GA29472@ldl.fc.hp.com> User-Agent: Mutt/1.5.17+20080114 (2008-01-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1950 Lines: 59 * Alex Chiang : > diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile > index ba6af16..ed32f67 100644 > --- a/drivers/pci/Makefile > +++ b/drivers/pci/Makefile > @@ -2,10 +2,11 @@ > # Makefile for the PCI bus specific drivers. > # > Actually... > -obj-y += access.o bus.o probe.o remove.o pci.o quirks.o slot.o \ > +obj-y += access.o bus.o probe.o remove.o pci.o quirks.o \ > pci-driver.o search.o pci-sysfs.o rom.o setup-res.o \ ^^^^^^^^^^^ > irq.o > obj-$(CONFIG_PROC_FS) += proc.o > +obj-$(CONFIG_SYSFS) += slot.o Here is v2. From: Alex Chiang PCI: drivers/pci/slot.c should depend on CONFIG_SYSFS There is no way to interact with a physical PCI slot without sysfs, so encode the dependency and prevent this build error: drivers/pci/slot.c: In function 'pci_hp_create_module_link': drivers/pci/slot.c:327: error: 'module_kset' undeclared Reported-by: Stephen Rothwell Fix-suggested-by: Matthew Wilcox Signed-off-by: Alex Chiang --- diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile index ba6af16..0be4efd 100644 --- a/drivers/pci/Makefile +++ b/drivers/pci/Makefile @@ -2,10 +2,11 @@ # Makefile for the PCI bus specific drivers. # -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-y += access.o bus.o probe.o remove.o pci.o quirks.o \ + pci-driver.o search.o rom.o setup-res.o \ irq.o obj-$(CONFIG_PROC_FS) += proc.o +obj-$(CONFIG_SYSFS) += slot.o pci-sysfs.o # Build PCI Express stuff if needed obj-$(CONFIG_PCIEPORTBUS) += pcie/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/