From 3e8f5b0805e5f93770e420e3f455b7d14d08173f Mon Sep 17 00:00:00 2001 From: Michal Wajdeczko Date: Fri, 24 Nov 2017 09:53:40 +0000 Subject: [PATCH] drm/i915/guc: Rename i915_guc_reg.h to intel_guc_reg.h We are using intel_ prefix for all file names with hardware related definitions. GuC registers also fall into this category. Signed-off-by: Michal Wajdeczko Cc: Chris Wilson Cc: Joonas Lahtinen Cc: Sagar Arun Kamble Reviewed-by: Sagar Arun Kamble Link: https://patchwork.freedesktop.org/patch/msgid/20171124095340.1500-1-michal.wajdeczko@intel.com Reviewed-by: Chris Wilson Signed-off-by: Chris Wilson --- drivers/gpu/drm/i915/intel_guc.h | 2 +- drivers/gpu/drm/i915/{i915_guc_reg.h => intel_guc_reg.h} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename drivers/gpu/drm/i915/{i915_guc_reg.h => intel_guc_reg.h} (98%) diff --git a/drivers/gpu/drm/i915/intel_guc.h b/drivers/gpu/drm/i915/intel_guc.h index 75c4cfefdaff..59856726d2bc 100644 --- a/drivers/gpu/drm/i915/intel_guc.h +++ b/drivers/gpu/drm/i915/intel_guc.h @@ -30,8 +30,8 @@ #include "intel_guc_fwif.h" #include "intel_guc_ct.h" #include "intel_guc_log.h" +#include "intel_guc_reg.h" #include "intel_uc_fw.h" -#include "i915_guc_reg.h" #include "i915_vma.h" struct guc_preempt_work { diff --git a/drivers/gpu/drm/i915/i915_guc_reg.h b/drivers/gpu/drm/i915/intel_guc_reg.h similarity index 98% rename from drivers/gpu/drm/i915/i915_guc_reg.h rename to drivers/gpu/drm/i915/intel_guc_reg.h index bc1ae7d8f424..0a8ff03d026f 100644 --- a/drivers/gpu/drm/i915/i915_guc_reg.h +++ b/drivers/gpu/drm/i915/intel_guc_reg.h @@ -21,8 +21,8 @@ * IN THE SOFTWARE. * */ -#ifndef _I915_GUC_REG_H_ -#define _I915_GUC_REG_H_ +#ifndef _INTEL_GUC_REG_H_ +#define _INTEL_GUC_REG_H_ /* Definitions of GuC H/W registers, bits, etc */ -- 2.30.2