tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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.

Linus Torvalds fdfe6d3d 1f1e2ce8

+1 -1
+1 -1
drivers/char/agp/intel-agp.c
··· 948 948 intel_private.ifp_resource.flags = IORESOURCE_MEM; 949 949 950 950 /* Setup chipset flush for 915 */ 951 - if (IS_I965 || IS_G33) { 951 + if (IS_I965 || IS_G33 || IS_G4X) { 952 952 intel_i965_g33_setup_chipset_flush(); 953 953 } else { 954 954 intel_i915_setup_chipset_flush();