BackMerge v4.18-rc7 into drm-next
rmk requested this for armada and I think we've had a few conflicts build up. Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
@@ -226,6 +226,8 @@ static int append_vbios_pptable(struct pp_hwmgr *hwmgr, PPTable_t *ppsmc_pptable
|
||||
|
||||
ppsmc_pptable->Vr2_I2C_address = smc_dpm_table.Vr2_I2C_address;
|
||||
|
||||
ppsmc_pptable->Vr2_I2C_address = smc_dpm_table.Vr2_I2C_address;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user