aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/bus.c
diff options
context:
space:
mode:
authorMyron Stowe <myron.stowe@redhat.com>2012-07-13 16:29:00 -0400
committerBjorn Helgaas <bhelgaas@google.com>2012-07-16 11:14:49 -0400
commit95df8b8708a8b381bf276d83c56f7b4e7de04a71 (patch)
tree930878161272c1c9c5a7f52988cc68bc53878c60 /drivers/pci/bus.c
parent735bff10c157fdbba2291e10ca3e28a59c7acc1c (diff)
PCI: fix undefined reference to 'pci_fixup_final_inited'
My "PCI: Integrate 'pci_fixup_final' quirks into hot-plug paths" patch introduced an undefined reference to 'pci_fixup_final_inited' when CONFIG_PCI_QUIRKS is not enabled (on x86_64): drivers/built-in.o: In function `pci_bus_add_device': (.text+0x4f62): undefined reference to `pci_fixup_final_inited' This patch removes the external reference ending up with a result closer to what we ultimately want when the boot path issues described in the original patch are resolved. References: https://lkml.org/lkml/2012/7/9/542 Original, offending, patch https://lkml.org/lkml/2012/7/12/338 Randy's catch Reported-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Myron Stowe <myron.stowe@redhat.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Diffstat (limited to 'drivers/pci/bus.c')
-rw-r--r--drivers/pci/bus.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c
index b511bd4e3f7..4b0970b46e0 100644
--- a/drivers/pci/bus.c
+++ b/drivers/pci/bus.c
@@ -164,10 +164,8 @@ pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res,
164int pci_bus_add_device(struct pci_dev *dev) 164int pci_bus_add_device(struct pci_dev *dev)
165{ 165{
166 int retval; 166 int retval;
167 extern bool pci_fixup_final_inited;
168 167
169 if (pci_fixup_final_inited) 168 pci_fixup_device(pci_fixup_final, dev);
170 pci_fixup_device(pci_fixup_final, dev);
171 retval = device_add(&dev->dev); 169 retval = device_add(&dev->dev);
172 if (retval) 170 if (retval)
173 return retval; 171 return retval;