vserver 1.9.5.x5

[linux-2.6.git] / arch / mips / pci / fixup-malta.c

diff --git a/arch/mips/pci/fixup-malta.c b/arch/mips/pci/fixup-malta.c
index 3345e19..b9296d9 100644 (file)
--- a/arch/mips/pci/fixup-malta.c
+++ b/arch/mips/pci/fixup-malta.c
@@ -43,11 +43,12 @@ int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
        return pci_irq[virq];
 }
 
-void __init pcibios_fixup_irqs(void)
+/* Do platform specific device initialization at pci_enable_device() time */
+int pcibios_plat_dev_init(struct pci_dev *dev)
 {
+       return 0;
 }
 
-
 static void __init malta_piix_func0_fixup(struct pci_dev *pdev)
 {
        unsigned char reg_val;
@@ -79,6 +80,8 @@ static void __init malta_piix_func0_fixup(struct pci_dev *pdev)
        }
 }
 
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB_0,
+        malta_piix_func0_fixup);
 
 static void __init malta_piix_func1_fixup(struct pci_dev *pdev)
 {
@@ -96,10 +99,5 @@ static void __init malta_piix_func1_fixup(struct pci_dev *pdev)
        }
 }
 
-struct pci_fixup pcibios_fixups[] __initdata = {
-       {PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB_0,
-        malta_piix_func0_fixup},
-       {PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB,
-        malta_piix_func1_fixup},
-       { 0 }
-};
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB,
+        malta_piix_func1_fixup);