From 75aa4c8aaad0fce451015149868335db961e6bf1 Mon Sep 17 00:00:00 2001 From: Ben Widawsky Date: Thu, 15 Nov 2012 12:06:09 -0800 Subject: [PATCH] --- yaml --- r: 345483 b: refs/heads/master c: d09105c66eb813ab3f57ba5e738f477f6ff92dec h: refs/heads/master i: 345481: bf2340ec1a3c1176a5303e3d73ab48733b737214 345479: 78c3d8b84fb7856c38a0c12612cdc19093b845d4 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_drv.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1bf900b07e27..94c399ef1b25 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 42d42e7e4220753bab3eb7b857721f203a4cd821 +refs/heads/master: d09105c66eb813ab3f57ba5e738f477f6ff92dec diff --git a/trunk/drivers/gpu/drm/i915/i915_drv.h b/trunk/drivers/gpu/drm/i915/i915_drv.h index 4b83e5f4b32e..dfb63fb48e24 100644 --- a/trunk/drivers/gpu/drm/i915/i915_drv.h +++ b/trunk/drivers/gpu/drm/i915/i915_drv.h @@ -1541,7 +1541,7 @@ void i915_gem_init_global_gtt(struct drm_device *dev, unsigned long end); int i915_gem_gtt_init(struct drm_device *dev); void i915_gem_gtt_fini(struct drm_device *dev); -extern inline void i915_gem_chipset_flush(struct drm_device *dev) +static inline void i915_gem_chipset_flush(struct drm_device *dev) { if (INTEL_INFO(dev)->gen < 6) intel_gtt_chipset_flush();