Merge ../linus/

1 files changed, 7 insertions, 2 deletions

diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c
index 6cf49394a80f..cf84350efc55 100644
--- a/drivers/ide/pci/alim15x3.c
+++ b/drivers/ide/pci/alim15x3.c
@@ -876,10 +876,15 @@ static ide_pci_device_t ali15x3_chipset __devinitdata = {
  
 static int __devinit alim15x3_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
+        static struct pci_device_id ati_rs100[] = {
+                { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS100) },
+                { },
+        };
+
         ide_pci_device_t *d = &ali15x3_chipset;
 
-        if(pci_find_device(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS100, NULL))
-                printk(KERN_ERR "Warning: ATI Radeon IGP Northbridge is not yet fully tested.\n");
+        if (pci_dev_present(ati_rs100))
+                printk(KERN_WARNING "alim15x3: ATI Radeon IGP Northbridge is not yet fully tested.\n");
 
 #if defined(CONFIG_SPARC64)
         d->init_hwif = init_hwif_common_ali15x3;