diff options
Diffstat (limited to 'drivers/ide')
-rw-r--r-- | drivers/ide/ppc/pmac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c index 071a030ec26e..774bfd39a599 100644 --- a/drivers/ide/ppc/pmac.c +++ b/drivers/ide/ppc/pmac.c | |||
@@ -1175,14 +1175,14 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif) | |||
1175 | pmif->broken_dma = 1; | 1175 | pmif->broken_dma = 1; |
1176 | } | 1176 | } |
1177 | 1177 | ||
1178 | bidp = get_property(np, "AAPL,bus-id", NULL); | 1178 | bidp = of_get_property(np, "AAPL,bus-id", NULL); |
1179 | pmif->aapl_bus_id = bidp ? *bidp : 0; | 1179 | pmif->aapl_bus_id = bidp ? *bidp : 0; |
1180 | 1180 | ||
1181 | /* Get cable type from device-tree */ | 1181 | /* Get cable type from device-tree */ |
1182 | if (pmif->kind == controller_kl_ata4 || pmif->kind == controller_un_ata6 | 1182 | if (pmif->kind == controller_kl_ata4 || pmif->kind == controller_un_ata6 |
1183 | || pmif->kind == controller_k2_ata6 | 1183 | || pmif->kind == controller_k2_ata6 |
1184 | || pmif->kind == controller_sh_ata6) { | 1184 | || pmif->kind == controller_sh_ata6) { |
1185 | const char* cable = get_property(np, "cable-type", NULL); | 1185 | const char* cable = of_get_property(np, "cable-type", NULL); |
1186 | if (cable && !strncmp(cable, "80-", 3)) | 1186 | if (cable && !strncmp(cable, "80-", 3)) |
1187 | pmif->cable_80 = 1; | 1187 | pmif->cable_80 = 1; |
1188 | } | 1188 | } |