From 5b2b8fb560dcb68e003ca63acad4ccc02c856b6e Mon Sep 17 00:00:00 2001
From: Zhenyu Wang <zhenyu.z.wang@intel.com>
Date: Fri, 20 Jun 2008 11:48:06 +1000
Subject: [PATCH] --- yaml --- r: 98309 b: refs/heads/master c:
 7d15ddf79ec35ce79093832c80b86c0888eb5bce h: refs/heads/master i:   98307:
 ad2cab971033d94c2982961f4dcdbbffb09f6162 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/char/agp/intel-agp.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0e773c164392..b3b48f72f2c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e480e5fc03c411d350478b2e8dc0906a37b6f07
+refs/heads/master: 7d15ddf79ec35ce79093832c80b86c0888eb5bce
diff --git a/trunk/drivers/char/agp/intel-agp.c b/trunk/drivers/char/agp/intel-agp.c
index 1ae64bb36771..df702642ab8f 100644
--- a/trunk/drivers/char/agp/intel-agp.c
+++ b/trunk/drivers/char/agp/intel-agp.c
@@ -948,7 +948,7 @@ static void intel_i9xx_setup_flush(void)
 	intel_private.ifp_resource.flags = IORESOURCE_MEM;
 
 	/* Setup chipset flush for 915 */
-	if (IS_I965 || IS_G33) {
+	if (IS_I965 || IS_G33 || IS_G4X) {
 		intel_i965_g33_setup_chipset_flush();
 	} else {
 		intel_i915_setup_chipset_flush();