Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / arch / sh / drivers / pci / fixups-dreamcast.c

diff --git a/arch/sh/drivers/pci/fixups-dreamcast.c b/arch/sh/drivers/pci/fixups-dreamcast.c
index aa5e24a..63b1c6f 100644 (file)
--- a/arch/sh/drivers/pci/fixups-dreamcast.c
+++ b/arch/sh/drivers/pci/fixups-dreamcast.c
@@ -15,7 +15,6 @@
  * for more details.
  */
 
-#include <linux/config.h>
 #include <linux/sched.h>
 #include <linux/kernel.h>
 #include <linux/param.h>
@@ -47,11 +46,7 @@ static void __init gapspci_fixup_resources(struct pci_dev *dev)
        }
 }
 
-struct pci_fixup pcibios_fixups[] = {
-       { PCI_FIXUP_HEADER, PCI_ANY_ID,
-         PCI_ANY_ID, gapspci_fixup_resources },
-       { 0, }
-};
+DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, gapspci_fixup_resources);
 
 void __init pcibios_fixup_bus(struct pci_bus *bus)
 {
@@ -66,7 +61,7 @@ void __init pcibios_fixup_irqs(void)
 {
        struct pci_dev *dev = 0;
 
-       while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
+       for_each_pci_dev(dev) {
                /*
                 * The interrupt routing semantics here are quite trivial.
                 *