---

yaml --- r: 334383 b: refs/heads/master c: 9169d3a h: refs/heads/master i: 334381: f985bfb 334379: c86d88d 334375: b50b677 334367: 43896ef v: v3
git-mirror · Oct 12, 2012 · da0cab4 · da0cab4
1 parent 3e47cbf
commit da0cab4
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: 1cf8378906b2d5a6449147914fe04c56d6f4fd87
+refs/heads/master: 9169d3a88072b20f42e68a946e916bd7dfbc7f2c
diff --git a/trunk/drivers/char/agp/intel-gtt.c b/trunk/drivers/char/agp/intel-gtt.c
@@ -667,7 +667,7 @@ static int intel_gtt_init(void)
 	gtt_map_size = intel_private.base.gtt_total_entries * 4;
 
 	intel_private.gtt = NULL;
-	if (INTEL_GTT_GEN < 6)
+	if (INTEL_GTT_GEN < 6 && INTEL_GTT_GEN > 2)
 		intel_private.gtt = ioremap_wc(intel_private.gtt_bus_addr,
 					       gtt_map_size);
 	if (intel_private.gtt == NULL)