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.
This commit is contained in:
commit
fdfe6d3d00
|
@ -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();
|
||||
|
|
Loading…
Reference in New Issue