Messages in this thread Patch in this message |  | | | Date | Wed, 18 Jun 2008 21:56:08 -0700 (PDT) | | From | Linus Torvalds <> | | Subject | Re: [git pull] agp patches for 2.6.26 final | |
On Thu, 19 Jun 2008, Dave Airlie wrote:
> > commit 62c96b9d0917894c164aa3e474a3ff3bca1554ae> Author: Dave Airlie <airlied@redhat.com>> Date: Thu Jun 19 14:27:53 2008 +1000> > agp/intel: cleanup some serious whitespace badness
>
> Signed-off-by: Dave Airlie <airlied@redhat.com>
Aarghh!
This one does _not_ just clean up whitespace. It also does
@@ -1959,8 +1959,6 @@ static const struct agp_bridge_driver intel_i965_driver = {
.size_type = FIXED_APER_SIZE,
.num_aperture_sizes = 4,
.needs_scratch_page = true,
- .configure = intel_i915_configure,
- .fetch_size = intel_i9xx_fetch_size,
.cleanup = intel_i915_cleanup,
.tlb_flush = intel_i810_tlbflush,
.mask_memory = intel_i965_mask_memory,
which may well be all good, but it doesn't match the commit message.
I merged it, but please be more careful.
Linus
|  |