From 0c64722d504cef17814584a84b0b9b40d82aad58 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Tue, 20 Mar 2012 14:20:50 +1000
Subject: [PATCH] --- yaml --- r: 307529 b: refs/heads/master c:
 f1c65e7c7fb7e109290e969ad17f08c45993b41c h: refs/heads/master i:   307527:
 866f99f6451c5d820b11415815d909f9fb908a06 v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/gpu/drm/nouveau/nouveau_dma.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index dc1843a36ed9..d1b7dace4363 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab394543ddd02b6cc6612a3c1991a18fb3056a45
+refs/heads/master: f1c65e7c7fb7e109290e969ad17f08c45993b41c
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_dma.h b/trunk/drivers/gpu/drm/nouveau/nouveau_dma.h
index 23d4edf992b7..47896c407284 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_dma.h
+++ b/trunk/drivers/gpu/drm/nouveau/nouveau_dma.h
@@ -50,8 +50,8 @@ void nv50_dma_push(struct nouveau_channel *, struct nouveau_bo *,
 enum {
 	NvSubM2MF	= 0,
 	NvSubSw		= 1,
-	NvSub2D		= 2,
 	NvSubCtxSurf2D  = 2,
+	NvSub2D		= 3,
 	NvSubGdiRect    = 3,
 	NvSubImageBlit  = 4
 };