Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1

[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 47df48a..a654014 100644 (file)
--- a/arch/alpha/kernel/sys_sio.c
+++ b/arch/alpha/kernel/sys_sio.c
@@ -10,14 +10,13 @@
  * Kenetics's Platform 2000, Avanti (AlphaStation), XL, and AlphaBook1.
  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/mm.h>
 #include <linux/sched.h>
 #include <linux/pci.h>
 #include <linux/init.h>
-#include <linux/tty.h>
+#include <linux/screen_info.h>
 
 #include <asm/compiler.h>
 #include <asm/ptrace.h>
@@ -105,7 +104,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 +228,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) {