Re: linux-next: Tree for June 17 (pci/slot)

Alex Chiang
2009-06-18T00:46:20Z

* 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/