From: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Date: Tue, 18 Feb 2014 11:43:16 +0000 (+0000)
Subject: ASoC: Intel: Rename SST trace event header to be less generic.
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b47bd099fbb3412e34e8915c7a06bc3dbe73bc01;p=linux-beck.git

ASoC: Intel: Rename SST trace event header to be less generic.

The Intel audio DSP SST trace event header has been renamed from sst.h
to intel-sst.h in order to avoid any confusion with any future
Samoa Standard Time drivers ;)

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
---

diff --git a/include/trace/events/sst.h b/include/trace/events/intel-sst.h
similarity index 94%
rename from include/trace/events/sst.h
rename to include/trace/events/intel-sst.h
index 1a0d6b3b1ae1..76c72d3f1902 100644
--- a/include/trace/events/sst.h
+++ b/include/trace/events/intel-sst.h
@@ -1,8 +1,8 @@
 #undef TRACE_SYSTEM
-#define TRACE_SYSTEM sst
+#define TRACE_SYSTEM intel-sst
 
-#if !defined(_TRACE_SST_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_SST_H
+#if !defined(_TRACE_INTEL_SST_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_INTEL_SST_H
 
 #include <linux/types.h>
 #include <linux/ktime.h>
diff --git a/sound/soc/intel/sst-dsp.c b/sound/soc/intel/sst-dsp.c
index 1888de54d079..e0ad2e50be52 100644
--- a/sound/soc/intel/sst-dsp.c
+++ b/sound/soc/intel/sst-dsp.c
@@ -24,7 +24,7 @@
 #include "sst-dsp-priv.h"
 
 #define CREATE_TRACE_POINTS
-#include <trace/events/sst.h>
+#include <trace/events/intel-sst.h>
 
 /* Public API */
 void sst_dsp_shim_write(struct sst_dsp *sst, u32 offset, u32 value)