| Message ID | 20090618004612.GB29472@ldl.fc.hp.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
Alex Chiang wrote: > * Alex Chiang <achiang@hp.com>: >> 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 <achiang@hp.com> > > 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 <sfr@canb.auug.org.au> > Fix-suggested-by: Matthew Wilcox <matthew@wil.cx> > Signed-off-by: Alex Chiang <achiang@hp.com> > --- > 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/ > -- Hi, Yes, v2 looks better, but still has some build problems. drivers/built-in.o: In function `pci_bus_add_device': (.text+0x20d2): undefined reference to `pci_create_sysfs_dev_files' drivers/built-in.o: In function `pci_stop_bus_device': (.text+0x2e41): undefined reference to `pci_remove_sysfs_dev_files' drivers/built-in.o: In function `proc_bus_pci_mmap': proc.c:(.text+0x744f): undefined reference to `pci_mmap_fits' drivers/built-in.o:(.data+0x324): undefined reference to `pci_bus_attrs' drivers/built-in.o:(.data+0x328): undefined reference to `pci_dev_attrs' config attached.
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/