--- zzzz-none-000/linux-2.6.19.2/drivers/scsi/aic94xx/aic94xx_seq.c 2007-01-10 19:10:37.000000000 +0000 +++ davinci-8020-5505/linux-2.6.19.2/drivers/scsi/aic94xx/aic94xx_seq.c 2007-01-11 07:38:19.000000000 +0000 @@ -1369,9 +1369,10 @@ * port_map_by_links is also used as the conn_mask byte in the * initiator/target port DDB. */ -void asd_update_port_links(struct asd_ha_struct *asd_ha, struct asd_phy *phy) +void asd_update_port_links(struct asd_sas_phy *sas_phy) { - const u8 phy_mask = (u8) phy->asd_port->phy_mask; + struct asd_ha_struct *asd_ha = sas_phy->ha->lldd_ha; + const u8 phy_mask = (u8) sas_phy->port->phy_mask; u8 phy_is_up; u8 mask; int i, err;