From 2b4b23a36a58f0944901ca9d2c299f98eb0a00d6 Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
Date: Sun, 3 Jun 2012 20:48:20 +0200
Subject: [PATCH] --- yaml --- r: 316475 b: refs/heads/master c:
 8ff255afb022b8e183c7aa1ecc4ba8d0563e1e17 h: refs/heads/master i:   316473:
 68e80c427a5c0e61a14f8cb0efb651401895c2f6   316471:
 22e45870de396f04e8f25117558fef19a8274e4e v: v3

---
 [refs]                        | 2 +-
 trunk/arch/alpha/kernel/pci.c | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 88a62118664e..5b66bebde99e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b99ea85a3acff53151322a1c882f217375b1300e
+refs/heads/master: 8ff255afb022b8e183c7aa1ecc4ba8d0563e1e17
diff --git a/trunk/arch/alpha/kernel/pci.c b/trunk/arch/alpha/kernel/pci.c
index 1a629636cc16..026d49f28de3 100644
--- a/trunk/arch/alpha/kernel/pci.c
+++ b/trunk/arch/alpha/kernel/pci.c
@@ -59,15 +59,13 @@ struct pci_controller *pci_isa_hose;
  * Quirks.
  */
 
-static void __init
-quirk_isa_bridge(struct pci_dev *dev)
+static void __devinit quirk_isa_bridge(struct pci_dev *dev)
 {
 	dev->class = PCI_CLASS_BRIDGE_ISA << 8;
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82378, quirk_isa_bridge);
 
-static void __init
-quirk_cypress(struct pci_dev *dev)
+static void __devinit quirk_cypress(struct pci_dev *dev)
 {
 	/* The Notorious Cy82C693 chip.  */
 
@@ -106,8 +104,7 @@ quirk_cypress(struct pci_dev *dev)
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_CONTAQ, PCI_DEVICE_ID_CONTAQ_82C693, quirk_cypress);
 
 /* Called for each device after PCI setup is done. */
-static void __init
-pcibios_fixup_final(struct pci_dev *dev)
+static void __devinit pcibios_fixup_final(struct pci_dev *dev)
 {
 	unsigned int class = dev->class >> 8;