diff --git a/[refs] b/[refs] index 8b566f3f3b27..c88d31430bbe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 536fcd5124df6af3b95f1bffc925d9ccb6d5b9df +refs/heads/master: 78930b1c39dd4a5afd5aa873eec11b5bd7079866 diff --git a/trunk/drivers/gpu/drm/radeon/r100.c b/trunk/drivers/gpu/drm/radeon/r100.c index 493b9b48da30..14b7541df38a 100644 --- a/trunk/drivers/gpu/drm/radeon/r100.c +++ b/trunk/drivers/gpu/drm/radeon/r100.c @@ -220,7 +220,6 @@ void r100_set_power_state(struct radeon_device *rdev, bool static_switch) void r100_pm_misc(struct radeon_device *rdev) { -#if 0 int requested_index = rdev->pm.requested_power_state_index; struct radeon_power_state *ps = &rdev->pm.power_state[requested_index]; struct radeon_voltage *voltage = &ps->clock_info[0].voltage; @@ -308,7 +307,6 @@ void r100_pm_misc(struct radeon_device *rdev) ps->pcie_lanes); DRM_INFO("Setting: p: %d\n", ps->pcie_lanes); } -#endif } void r100_pm_prepare(struct radeon_device *rdev)