From b3aab1305d53f914de88997cab783c1da9d404b2 Mon Sep 17 00:00:00 2001
From: David Woodhouse <David.Woodhouse@intel.com>
Date: Mon, 12 Oct 2009 12:48:43 +0100
Subject: [PATCH] --- yaml --- r: 167391 b: refs/heads/master c:
 8d86fb2c80ec376b35ae64ac858d406ae1d42a3f h: refs/heads/master i:   167389:
 4906bd183b1fecce2bd99ce51026ab25c5db7163   167387:
 7d2502ba9ce2acd3e1264092d6963eacd2c87220   167383:
 d4fc864a4797cb65e02641de93ac38de6e89ed2b   167375:
 f7ae91a61bb3a183a2bcf2766fd1518e328c212f   167359:
 0c625b63837db696478185dd060038bae70a5740 v: v3

---
 [refs]                     |  2 +-
 trunk/drivers/pci/pci.c    | 13 -------------
 trunk/drivers/pci/quirks.c | 13 +++++++++++++
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index dd4315c8d7ea..38b836fe2edf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0fc7e0b4b5e69616f10a894ab9afff3c64be74e
+refs/heads/master: 8d86fb2c80ec376b35ae64ac858d406ae1d42a3f
diff --git a/trunk/drivers/pci/pci.c b/trunk/drivers/pci/pci.c
index 6edecff0b419..2b575cfb4b09 100644
--- a/trunk/drivers/pci/pci.c
+++ b/trunk/drivers/pci/pci.c
@@ -2719,17 +2719,6 @@ int __attribute__ ((weak)) pci_ext_cfg_avail(struct pci_dev *dev)
 	return 1;
 }
 
-static int __devinit pci_init(void)
-{
-	struct pci_dev *dev = NULL;
-
-	while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
-		pci_fixup_device(pci_fixup_final, dev);
-	}
-
-	return 0;
-}
-
 static int __init pci_setup(char *str)
 {
 	while (str) {
@@ -2767,8 +2756,6 @@ static int __init pci_setup(char *str)
 }
 early_param("pci", pci_setup);
 
-device_initcall(pci_init);
-
 EXPORT_SYMBOL(pci_reenable_device);
 EXPORT_SYMBOL(pci_enable_device_io);
 EXPORT_SYMBOL(pci_enable_device_mem);
diff --git a/trunk/drivers/pci/quirks.c b/trunk/drivers/pci/quirks.c
index 6099facecd79..014227540ac9 100644
--- a/trunk/drivers/pci/quirks.c
+++ b/trunk/drivers/pci/quirks.c
@@ -2572,6 +2572,19 @@ void pci_fixup_device(enum pci_fixup_pass pass, struct pci_dev *dev)
 	}
 	pci_do_fixups(dev, start, end);
 }
+
+static int __devinit pci_apply_final_quirks(void)
+{
+	struct pci_dev *dev = NULL;
+
+	while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
+		pci_fixup_device(pci_fixup_final, dev);
+	}
+
+	return 0;
+}
+
+device_initcall(pci_apply_final_quirks);
 #else
 void pci_fixup_device(enum pci_fixup_pass pass, struct pci_dev *dev) {}
 #endif