diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-18 18:58:38 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-18 18:58:38 -0500 |
| commit | b286e39207237e2f6929959372bf66d9a8d05a82 (patch) | |
| tree | 0a88ef7c8a91b8cd1afbb85d4b60c9452cc0770e /drivers/ide/pci/alim15x3.c | |
| parent | bcb6ad1f5adb267c7b509f83e8edb16cc59d8500 (diff) | |
| parent | 6593178dd46d64a5bcb0402a4f3acd95b0687abd (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
Diffstat (limited to 'drivers/ide/pci/alim15x3.c')
| -rw-r--r-- | drivers/ide/pci/alim15x3.c | 9 |
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 = { | |||
| 876 | 876 | ||
| 877 | static int __devinit alim15x3_init_one(struct pci_dev *dev, const struct pci_device_id *id) | 877 | static int __devinit alim15x3_init_one(struct pci_dev *dev, const struct pci_device_id *id) |
| 878 | { | 878 | { |
| 879 | static struct pci_device_id ati_rs100[] = { | ||
| 880 | { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS100) }, | ||
| 881 | { }, | ||
| 882 | }; | ||
| 883 | |||
| 879 | ide_pci_device_t *d = &ali15x3_chipset; | 884 | ide_pci_device_t *d = &ali15x3_chipset; |
| 880 | 885 | ||
| 881 | if(pci_find_device(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS100, NULL)) | 886 | if (pci_dev_present(ati_rs100)) |
| 882 | printk(KERN_ERR "Warning: ATI Radeon IGP Northbridge is not yet fully tested.\n"); | 887 | printk(KERN_WARNING "alim15x3: ATI Radeon IGP Northbridge is not yet fully tested.\n"); |
| 883 | 888 | ||
| 884 | #if defined(CONFIG_SPARC64) | 889 | #if defined(CONFIG_SPARC64) |
| 885 | d->init_hwif = init_hwif_common_ali15x3; | 890 | d->init_hwif = init_hwif_common_ali15x3; |