Re: [git pull] agp patches for 2.6.26 final

[Dave Airlie]

> On Thu, 19 Jun 2008, Dave Airlie wrote:
> > 
> > commit 62c96b9d0917894c164aa3e474a3ff3bca1554ae
> > Author: Dave Airlie <airlied@xxxxxxxxxx>
> > Date:   Thu Jun 19 14:27:53 2008 +1000
> > 
> >     agp/intel: cleanup some serious whitespace badness
> >     
> >     Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
> 
> 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.
> 

DAMNIT.

I can't believe that happened, I going to stop doing whitespace cleanups 
now, I just got shocked when I realised how much 7 space indents that file 
has.

You are right please put back the two lines as per the attached patch.

Dave.commit 0e480e5fc03c411d350478b2e8dc0906a37b6f07
Author: Dave Airlie <airlied@xxxxxxxxxx>
Date:   Thu Jun 19 14:57:31 2008 +1000

    agp: brown paper bag patch - put back the two lines it took out.
    
    no more whitespace diffs for me.
    
    Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>

diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index 30aa01b..1ae64bb 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -1959,6 +1959,8 @@ 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,