diff options
Diffstat (limited to 'drivers/ide')
-rw-r--r-- | drivers/ide/pci/pdc202xx_new.c | 2 | ||||
-rw-r--r-- | drivers/ide/ppc/pmac.c | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c index ace98929cc3d..ae20fb3f6cbc 100644 --- a/drivers/ide/pci/pdc202xx_new.c +++ b/drivers/ide/pci/pdc202xx_new.c | |||
@@ -398,7 +398,7 @@ static void __devinit apple_kiwi_init(struct pci_dev *pdev) | |||
398 | unsigned int class_rev = 0; | 398 | unsigned int class_rev = 0; |
399 | u8 conf; | 399 | u8 conf; |
400 | 400 | ||
401 | if (np == NULL || !device_is_compatible(np, "kiwi-root")) | 401 | if (np == NULL || !of_device_is_compatible(np, "kiwi-root")) |
402 | return; | 402 | return; |
403 | 403 | ||
404 | pci_read_config_dword(pdev, PCI_CLASS_REVISION, &class_rev); | 404 | pci_read_config_dword(pdev, PCI_CLASS_REVISION, &class_rev); |
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c index 774bfd39a599..a49ebe44babd 100644 --- a/drivers/ide/ppc/pmac.c +++ b/drivers/ide/ppc/pmac.c | |||
@@ -1157,18 +1157,18 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif) | |||
1157 | 1157 | ||
1158 | pmif->cable_80 = 0; | 1158 | pmif->cable_80 = 0; |
1159 | pmif->broken_dma = pmif->broken_dma_warn = 0; | 1159 | pmif->broken_dma = pmif->broken_dma_warn = 0; |
1160 | if (device_is_compatible(np, "shasta-ata")) | 1160 | if (of_device_is_compatible(np, "shasta-ata")) |
1161 | pmif->kind = controller_sh_ata6; | 1161 | pmif->kind = controller_sh_ata6; |
1162 | else if (device_is_compatible(np, "kauai-ata")) | 1162 | else if (of_device_is_compatible(np, "kauai-ata")) |
1163 | pmif->kind = controller_un_ata6; | 1163 | pmif->kind = controller_un_ata6; |
1164 | else if (device_is_compatible(np, "K2-UATA")) | 1164 | else if (of_device_is_compatible(np, "K2-UATA")) |
1165 | pmif->kind = controller_k2_ata6; | 1165 | pmif->kind = controller_k2_ata6; |
1166 | else if (device_is_compatible(np, "keylargo-ata")) { | 1166 | else if (of_device_is_compatible(np, "keylargo-ata")) { |
1167 | if (strcmp(np->name, "ata-4") == 0) | 1167 | if (strcmp(np->name, "ata-4") == 0) |
1168 | pmif->kind = controller_kl_ata4; | 1168 | pmif->kind = controller_kl_ata4; |
1169 | else | 1169 | else |
1170 | pmif->kind = controller_kl_ata3; | 1170 | pmif->kind = controller_kl_ata3; |
1171 | } else if (device_is_compatible(np, "heathrow-ata")) | 1171 | } else if (of_device_is_compatible(np, "heathrow-ata")) |
1172 | pmif->kind = controller_heathrow; | 1172 | pmif->kind = controller_heathrow; |
1173 | else { | 1173 | else { |
1174 | pmif->kind = controller_ohare; | 1174 | pmif->kind = controller_ohare; |
@@ -1190,8 +1190,8 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif) | |||
1190 | * they have a 80 conductor cable, this seem to be always the case unless | 1190 | * they have a 80 conductor cable, this seem to be always the case unless |
1191 | * the user mucked around | 1191 | * the user mucked around |
1192 | */ | 1192 | */ |
1193 | if (device_is_compatible(np, "K2-UATA") || | 1193 | if (of_device_is_compatible(np, "K2-UATA") || |
1194 | device_is_compatible(np, "shasta-ata")) | 1194 | of_device_is_compatible(np, "shasta-ata")) |
1195 | pmif->cable_80 = 1; | 1195 | pmif->cable_80 = 1; |
1196 | 1196 | ||
1197 | /* On Kauai-type controllers, we make sure the FCR is correct */ | 1197 | /* On Kauai-type controllers, we make sure the FCR is correct */ |