summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2008-06-19 14:57:31 +1000
committerLinus Torvalds <torvalds@linux-foundation.org>2008-06-18 22:12:50 -0700
commit9bedbcb207ed9a571b239231d99c8fd4a34ae24d (patch)
tree2fd3a4873977aeff6008fe08a1bc195afe2d9968
parent3506ba7b082f9330657b3386c98246d5fda6c698 (diff)
downloadlinux-9bedbcb207ed9a571b239231d99c8fd4a34ae24d.tar.gz
linux-9bedbcb207ed9a571b239231d99c8fd4a34ae24d.tar.bz2
linux-9bedbcb207ed9a571b239231d99c8fd4a34ae24d.zip
agp: brown paper bag patch - put back two lines that got lost
Commit 62c96b9d0917894c164aa3e474a3ff3bca1554ae ("agp/intel: cleanup some serious whitespace badness") didn't just fix whitespace. It also lost two lines. Noticed by Linus. No more whitespace diffs for me. Signed-off-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/char/agp/intel-agp.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index 30aa01b738b4..1ae64bb36771 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,