From: Damien Lespiau <damien.lespiau@intel.com>
Date: Tue, 20 Jan 2015 12:51:49 +0000 (+0000)
Subject: drm/i915: Make intel_format_to_fourcc() static
X-Git-Tag: fixes-v4.0-rc1~91^2~8^2~61
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a55ecbe339846d883c860fb2143a77ea4c47e7b8;p=pandora-kernel.git

drm/i915: Make intel_format_to_fourcc() static

v2: Fix conflict caused by the introduction of struct intel_crtc_state

Reviewed-By: Tvrtko Ursulin <tvrtko.ursulin@intel.com> (v1)
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index d94ab6eb07c5..95bb420f61e7 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2316,7 +2316,7 @@ unsigned long intel_gen4_compute_page_offset(int *x, int *y,
 	}
 }
 
-int intel_format_to_fourcc(int format)
+static int intel_format_to_fourcc(int format)
 {
 	switch (format) {
 	case DISPPLANE_8BPP:
Reading git-diff-tree failed