[016/493] PCI: always build setup-bus when PCI is enabled

Submitted by Bill Pemberton on Nov. 19, 2012, 6:19 p.m.

Details

Message ID 1353349642-3677-16-git-send-email-wfp5p@virginia.edu
State Accepted
Headers show

Commit Message

Bill Pemberton Nov. 19, 2012, 6:19 p.m.
CONFIG_HOTPLUG is being removed so setup-bus always needs to be built
as part of PCI.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: linux-pci@vger.kernel.org 
---
 drivers/pci/Makefile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

Comments

Bjorn Helgaas Nov. 20, 2012, 5:50 p.m.
On Mon, Nov 19, 2012 at 11:19 AM, Bill Pemberton <wfp5p@virginia.edu> wrote:
> CONFIG_HOTPLUG is being removed so setup-bus always needs to be built
> as part of PCI.
>
> Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
> Cc: linux-pci@vger.kernel.org

These all look fine to me.  Please make the changelog subjects
consistently capitalize the "PCI" acronym and also the first word of
the rest, e.g., "PCI: Always ..."

If you want me to take them through my PCI tree, I can, but I assume
Greg is going to take them through the driver core tree, and that's
fine with me.

FWIW, I agree with Grant Likely's comments about squashing the
devinit/devexit/etc patches.  That would be fine with me.

> ---
>  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
> --
> 1.8.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Bill Pemberton Nov. 20, 2012, 9:14 p.m.
Bjorn Helgaas writes:
> 
> On Mon, Nov 19, 2012 at 11:19 AM, Bill Pemberton <wfp5p@virginia.edu> wrote:
> > CONFIG_HOTPLUG is being removed so setup-bus always needs to be built
> > as part of PCI.
> >
> > Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
> > Cc: linux-pci@vger.kernel.org
> 
> These all look fine to me.  Please make the changelog subjects
> consistently capitalize the "PCI" acronym and also the first word of
> the rest, e.g., "PCI: Always ..."
> 
> If you want me to take them through my PCI tree, I can, but I assume
> Greg is going to take them through the driver core tree, and that's
> fine with me.
> 
> FWIW, I agree with Grant Likely's comments about squashing the
> devinit/devexit/etc patches.  That would be fine with me.

The plan was for them to go through Greg's driver core tree.

I'll redo the PCI related ones as you've requested and resend them.
I probably won't be able to get to it until tomorrow though.

Patch hide | download patch | download mbox

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