---

yaml --- r: 318638 b: refs/heads/master c: e486fad h: refs/heads/master v: v3
git-mirror · Jun 28, 2012 · 7e24c5d · 7e24c5d
1 parent c9b9a40
commit 7e24c5d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 97f209bcfc0c5db08d9badf8cbafd489f22a6e44
+refs/heads/master: e486fad9136dce21f5ba4322ae0454d23805d342
diff --git a/trunk/drivers/gpu/drm/i915/i915_reg.h b/trunk/drivers/gpu/drm/i915/i915_reg.h
@@ -4435,7 +4435,7 @@
 #define PIPE_WM_LINETIME_B		0x45274
 #define PIPE_WM_LINETIME(pipe) _PIPE(pipe, \
 					PIPE_WM_LINETIME_A, \
-					PIPE_WM_LINETIME_A)
+					PIPE_WM_LINETIME_B)
 #define   PIPE_WM_LINETIME_MASK		(0x1ff)
 #define   PIPE_WM_LINETIME_TIME(x)			((x))
 #define   PIPE_WM_LINETIME_IPS_LINETIME_MASK	(0x1ff<<16)