Re: [git pull] agp patches for 2.6.26 final

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Dave Airlie <airlied@...>
Cc: Andrew Morton <akpm@...>, <linux-kernel@...>
Date: Thursday, June 19, 2008 - 12:56 am

On Thu, 19 Jun 2008, Dave Airlie wrote:

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
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[git pull] agp patches for 2.6.26 final, Dave Airlie, (Thu Jun 19, 12:41 am)
Re: [git pull] agp patches for 2.6.26 final, Zhenyu Wang, (Thu Jun 19, 1:46 am)
Re: [git pull] agp patches for 2.6.26 final, Linus Torvalds, (Thu Jun 19, 12:56 am)
Re: [git pull] agp patches for 2.6.26 final, Dave Airlie, (Thu Jun 19, 1:01 am)