Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / arch / alpha / kernel / sys_sio.c

diff --git a/arch/alpha/kernel/sys_sio.c b/arch/alpha/kernel/sys_sio.c
index 177e127..131a2d9 100644 (file)
--- a/arch/alpha/kernel/sys_sio.c
+++ b/arch/alpha/kernel/sys_sio.c
@@ -105,7 +105,7 @@ sio_collect_irq_levels(void)
        struct pci_dev *dev = NULL;
 
        /* Iterate through the devices, collecting IRQ levels.  */
-       while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
+       for_each_pci_dev(dev) {
                if ((dev->class >> 16 == PCI_BASE_CLASS_BRIDGE) &&
                    (dev->class >> 8 != PCI_CLASS_BRIDGE_PCMCIA))
                        continue;
@@ -229,8 +229,8 @@ alphabook1_init_pci(void)
         */
 
        dev = NULL;
-       while ((dev = pci_find_device(PCI_VENDOR_ID_NCR, PCI_ANY_ID, dev))) {
-                if (dev->device == PCI_DEVICE_ID_NCR_53C810
+       while ((dev = pci_get_device(PCI_VENDOR_ID_NCR, PCI_ANY_ID, dev))) {
+               if (dev->device == PCI_DEVICE_ID_NCR_53C810
                    || dev->device == PCI_DEVICE_ID_NCR_53C815
                    || dev->device == PCI_DEVICE_ID_NCR_53C820
                    || dev->device == PCI_DEVICE_ID_NCR_53C825) {
@@ -288,7 +288,6 @@ struct alpha_machine_vector alphabook1_mv __initmv = {
        DO_EV4_MMU,
        DO_DEFAULT_RTC,
        DO_LCA_IO,
-       DO_LCA_BUS,
        .machine_check          = lca_machine_check,
        .max_isa_dma_address    = ALPHA_MAX_ISA_DMA_ADDRESS,
        .min_io_address         = DEFAULT_IO_BASE,
@@ -319,7 +318,6 @@ struct alpha_machine_vector avanti_mv __initmv = {
        DO_EV4_MMU,
        DO_DEFAULT_RTC,
        DO_APECS_IO,
-       DO_APECS_BUS,
        .machine_check          = apecs_machine_check,
        .max_isa_dma_address    = ALPHA_MAX_ISA_DMA_ADDRESS,
        .min_io_address         = DEFAULT_IO_BASE,
@@ -349,7 +347,6 @@ struct alpha_machine_vector noname_mv __initmv = {
        DO_EV4_MMU,
        DO_DEFAULT_RTC,
        DO_LCA_IO,
-       DO_LCA_BUS,
        .machine_check          = lca_machine_check,
        .max_isa_dma_address    = ALPHA_MAX_ISA_DMA_ADDRESS,
        .min_io_address         = DEFAULT_IO_BASE,
@@ -388,7 +385,6 @@ struct alpha_machine_vector p2k_mv __initmv = {
        DO_EV4_MMU,
        DO_DEFAULT_RTC,
        DO_LCA_IO,
-       DO_LCA_BUS,
        .machine_check          = lca_machine_check,
        .max_isa_dma_address    = ALPHA_MAX_ISA_DMA_ADDRESS,
        .min_io_address         = DEFAULT_IO_BASE,
@@ -418,7 +414,6 @@ struct alpha_machine_vector xl_mv __initmv = {
        DO_EV4_MMU,
        DO_DEFAULT_RTC,
        DO_APECS_IO,
-       BUS(apecs),
        .machine_check          = apecs_machine_check,
        .max_isa_dma_address    = ALPHA_XL_MAX_ISA_DMA_ADDRESS,
        .min_io_address         = DEFAULT_IO_BASE,