diff options
| author | Sumit Singh <sumsingh@nvidia.com> | 2016-03-30 01:44:33 -0400 |
|---|---|---|
| committer | Sumit Singh <sumsingh@nvidia.com> | 2016-03-30 01:47:41 -0400 |
| commit | 466dc96afef268e57bbdc4bbf8a243fcdfdde164 (patch) | |
| tree | fb176732feb8df23eccfede45e8416c4fc2806f9 /drivers/gpu/nvgpu/vgpu | |
| parent | c72ea9f83e1ec690247524dbe348c376ba074e85 (diff) | |
| parent | 383c769995dd8df1c5fd83b5778d37bf347618ca (diff) | |
Merge branch 'PM_RUNTIME-Removal' into 'dev-kernel-3.18'
This change performs merge of 'PM_RUNTIME_Removal' dev-branch with
'dev-kernel-3.18' branch. It replaces CONFIG_PM_RUNTIME with CONFIG_PM.
JIRA TPM-704
Change-Id: I306e254716f275c283f727fc232d7244939542b6
Signed-off-by: Sumit Singh <sumsingh@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/vgpu')
| -rw-r--r-- | drivers/gpu/nvgpu/vgpu/vgpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.c b/drivers/gpu/nvgpu/vgpu/vgpu.c index 57f510ca..5a953e20 100644 --- a/drivers/gpu/nvgpu/vgpu/vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/vgpu.c | |||
| @@ -359,7 +359,7 @@ static int vgpu_pm_initialise_domain(struct platform_device *pdev) | |||
| 359 | 359 | ||
| 360 | domain->name = "gpu"; | 360 | domain->name = "gpu"; |
| 361 | 361 | ||
| 362 | #ifdef CONFIG_PM_RUNTIME | 362 | #ifdef CONFIG_PM |
| 363 | pm_domain_gov = &pm_domain_always_on_gov; | 363 | pm_domain_gov = &pm_domain_always_on_gov; |
| 364 | #endif | 364 | #endif |
| 365 | 365 | ||