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 This patch _should_ make pci-sysfs.o depend on CONFIG_SYSFS too, but we cannot (yet) because the PCI core merrily assumes the existence of sysfs: drivers/built-in.o: In function `pci_bus_add_device': drivers/pci/bus.c:89: undefined reference to `pci_create_sysfs_dev_files' drivers/built-in.o: In function `pci_stop_dev': drivers/pci/remove.c:24: undefined reference to `pci_remove_sysfs_dev_files' So do the minimal bit for now and figure out how to untangle it later. Reported-by: Randy Dunlap <randy.dunlap@oracle.com> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> 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> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
parent
110828c9cd
commit
268a03a42d
|
@ -266,6 +266,7 @@ config ACPI_DEBUG_FUNC_TRACE
|
||||||
|
|
||||||
config ACPI_PCI_SLOT
|
config ACPI_PCI_SLOT
|
||||||
tristate "PCI slot detection driver"
|
tristate "PCI slot detection driver"
|
||||||
|
depends on SYSFS
|
||||||
default n
|
default n
|
||||||
help
|
help
|
||||||
This driver creates entries in /sys/bus/pci/slots/ for all PCI
|
This driver creates entries in /sys/bus/pci/slots/ for all PCI
|
||||||
|
|
|
@ -2,10 +2,11 @@
|
||||||
# Makefile for the PCI bus specific drivers.
|
# Makefile for the PCI bus specific drivers.
|
||||||
#
|
#
|
||||||
|
|
||||||
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 \
|
pci-driver.o search.o pci-sysfs.o rom.o setup-res.o \
|
||||||
irq.o
|
irq.o
|
||||||
obj-$(CONFIG_PROC_FS) += proc.o
|
obj-$(CONFIG_PROC_FS) += proc.o
|
||||||
|
obj-$(CONFIG_SYSFS) += slot.o
|
||||||
|
|
||||||
# Build PCI Express stuff if needed
|
# Build PCI Express stuff if needed
|
||||||
obj-$(CONFIG_PCIEPORTBUS) += pcie/
|
obj-$(CONFIG_PCIEPORTBUS) += pcie/
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
menuconfig HOTPLUG_PCI
|
menuconfig HOTPLUG_PCI
|
||||||
tristate "Support for PCI Hotplug"
|
tristate "Support for PCI Hotplug"
|
||||||
depends on PCI && HOTPLUG
|
depends on PCI && HOTPLUG && SYSFS
|
||||||
---help---
|
---help---
|
||||||
Say Y here if you have a motherboard with a PCI Hotplug controller.
|
Say Y here if you have a motherboard with a PCI Hotplug controller.
|
||||||
This allows you to add and remove PCI cards while the machine is
|
This allows you to add and remove PCI cards while the machine is
|
||||||
|
|
Loading…
Reference in New Issue