From 882df7a9a6fbafa0762f76c97f280f052014c278 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Mon, 31 Jan 2011 16:23:27 +1000
Subject: [PATCH] --- yaml --- r: 232812 b: refs/heads/master c:
 c4534fdf5603ef53fce2f418df7b5a19e71281e3 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index d52ba4d71e1a..21ca3ebc1624 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c06a3e02062a9beb71a9444c49fb0fbcaa1eed3
+refs/heads/master: c4534fdf5603ef53fce2f418df7b5a19e71281e3
diff --git a/trunk/drivers/gpu/drm/nouveau/nv50_evo.c b/trunk/drivers/gpu/drm/nouveau/nv50_evo.c
index 14e24e906ee8..0ea090f4244a 100644
--- a/trunk/drivers/gpu/drm/nouveau/nv50_evo.c
+++ b/trunk/drivers/gpu/drm/nouveau/nv50_evo.c
@@ -283,8 +283,7 @@ nv50_evo_create(struct drm_device *dev)
 			nv50_evo_channel_del(&dev_priv->evo);
 			return ret;
 		}
-	} else
-	if (dev_priv->chipset != 0x50) {
+	} else {
 		ret = nv50_evo_dmaobj_new(evo, 0x3d, NvEvoFB16, 0x70, 0x19,
 					  0, 0xffffffff, 0x00010000);
 		if (ret) {