From 81113535c1eb4d1889338d6d5f993f51c5227c2d Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Sat, 21 Apr 2012 23:17:55 +0200 Subject: [PATCH] --- yaml --- r: 307287 b: refs/heads/master c: 63c62275ec484a0f6da6a600d9b44ee0279c0900 h: refs/heads/master i: 307285: 9a13520faa24c76301499259700321dfaa13c050 307283: 6fc83d2fc3a4dc3693b37500653ee7274d103662 307279: 073a01b40c4d4ce44625772e4f02aef192bde906 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_pm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7bf21d43885e..2027d39962ca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4f0c7cfbb4d25aad44137b6531365d29d3080349 +refs/heads/master: 63c62275ec484a0f6da6a600d9b44ee0279c0900 diff --git a/trunk/drivers/gpu/drm/i915/intel_pm.c b/trunk/drivers/gpu/drm/i915/intel_pm.c index 36940a390ef2..a2d2ce474d0e 100644 --- a/trunk/drivers/gpu/drm/i915/intel_pm.c +++ b/trunk/drivers/gpu/drm/i915/intel_pm.c @@ -562,7 +562,7 @@ static const struct cxsr_latency cxsr_latency_table[] = { {0, 1, 400, 800, 6042, 36042, 6584, 36584}, /* DDR3-800 SC */ }; -const struct cxsr_latency *intel_get_cxsr_latency(int is_desktop, +static const struct cxsr_latency *intel_get_cxsr_latency(int is_desktop, int is_ddr3, int fsb, int mem)