aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiam Girdwood <liam.r.girdwood@linux.intel.com>2014-02-18 11:43:16 +0000
committerMark Brown <broonie@linaro.org>2014-02-19 13:27:04 +0900
commitb47bd099fbb3412e34e8915c7a06bc3dbe73bc01 (patch)
tree56ed99b2640b8f7430079803a22a9a14585307f5
parent2280e90efae92060f6fa717fb1afa9861bd2b520 (diff)
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>
-rw-r--r--include/trace/events/intel-sst.h (renamed from include/trace/events/sst.h)6
-rw-r--r--sound/soc/intel/sst-dsp.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/include/trace/events/sst.h b/include/trace/events/intel-sst.h
index 1a0d6b3b1ae..76c72d3f190 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 1888de54d07..e0ad2e50be5 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)