vserver 1.9.5.x5

[linux-2.6.git] / arch / i386 / kernel / cpu / cyrix.c

diff --git a/arch/i386/kernel/cpu/cyrix.c b/arch/i386/kernel/cpu/cyrix.c
index 55df60a..98b85b6 100644 (file)
--- a/arch/i386/kernel/cpu/cyrix.c
+++ b/arch/i386/kernel/cpu/cyrix.c
@@ -187,6 +187,14 @@ static void __init geode_configure(void)
 }
 
 
+#ifdef CONFIG_PCI
+static struct pci_device_id cyrix_55x0[] = {
+       { PCI_DEVICE(PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5510) },
+       { PCI_DEVICE(PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5520) },
+       { },
+};
+#endif
+
 static void __init init_cyrix(struct cpuinfo_x86 *c)
 {
        unsigned char dir0, dir0_msn, dir0_lsn, dir1 = 0;
@@ -274,8 +282,7 @@ static void __init init_cyrix(struct cpuinfo_x86 *c)
                /*
                 *  The 5510/5520 companion chips have a funky PIT.
                 */  
-               if (pci_find_device(PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5510, NULL) ||
-                   pci_find_device(PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5520, NULL))
+               if (pci_dev_present(cyrix_55x0))
                        pit_latch_buggy = 1;
 
                /* GXm supports extended cpuid levels 'ala' AMD */