diff --git a/[refs] b/[refs] index 464b97c34f78..1b73b9ac5cc3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d6dd9eb1d96d2b7345fe4664066c2b7ed86da898 +refs/heads/master: d93c6233543cdab83eca4d0590737c3e99314fd6 diff --git a/trunk/drivers/gpu/drm/i915/i915_gem_gtt.c b/trunk/drivers/gpu/drm/i915/i915_gem_gtt.c index 71f09a8a00f4..bdaca3f47988 100644 --- a/trunk/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/trunk/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -773,7 +773,7 @@ static int gen6_gmch_probe(struct drm_device *dev, return ret; } -void gen6_gmch_remove(struct drm_device *dev) +static void gen6_gmch_remove(struct drm_device *dev) { struct drm_i915_private *dev_priv = dev->dev_private; iounmap(dev_priv->gtt.gsm);