diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-20 21:37:55 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-20 21:37:55 +0200 |
| commit | fdfe6d3d000775b50fb1adbc278ba0a34c3007c7 (patch) | |
| tree | 1d8f90f6be657cd7de16692474d9e85d7bc2f92d | |
| parent | Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | [agp]: fixup chipset flush for new Intel G4x. (diff) | |
| download | linux-fdfe6d3d000775b50fb1adbc278ba0a34c3007c7.tar.xz linux-fdfe6d3d000775b50fb1adbc278ba0a34c3007c7.zip | |
Merge branch 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6
* 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6:
[agp]: fixup chipset flush for new Intel G4x.
agp: brown paper bag patch - put back the two lines it took out.
| -rw-r--r-- | drivers/char/agp/intel-agp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c index 1ae64bb36771..df702642ab8f 100644 --- a/drivers/char/agp/intel-agp.c +++ b/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(); |