aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo Padovan <gustavo.padovan@collabora.co.uk>2016-05-31 16:59:12 -0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-06-17 21:17:40 -0700
commit1fe82e2e148697fd1fbbb2944e143b182c51e227 (patch)
treef10daa1c4e593d4c060fd9caa9a1c4ec94e0ade2
parentb9bc2b7b658a4bee8884e2c339a0a27f4bfa7f22 (diff)
staging/android: rename sync.h to sync_debug.h
This header file only contains information for debugging and SW_SYNC, so rename it to sync_debug.h instead of having a more generic name. Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Reviewed-by: Sumit Semwal <sumit.semwal@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/android/sw_sync.c2
-rw-r--r--drivers/staging/android/sync_debug.c2
-rw-r--r--drivers/staging/android/sync_debug.h (renamed from drivers/staging/android/sync.h)0
-rw-r--r--drivers/staging/android/trace/sync.h2
4 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/android/sw_sync.c b/drivers/staging/android/sw_sync.c
index ae56ece..115c917 100644
--- a/drivers/staging/android/sw_sync.c
+++ b/drivers/staging/android/sw_sync.c
@@ -20,7 +20,7 @@
#include <linux/slab.h>
#include <linux/sync_file.h>
-#include "sync.h"
+#include "sync_debug.h"
#define CREATE_TRACE_POINTS
#include "trace/sync.h"
diff --git a/drivers/staging/android/sync_debug.c b/drivers/staging/android/sync_debug.c
index b2697a1..b760226 100644
--- a/drivers/staging/android/sync_debug.c
+++ b/drivers/staging/android/sync_debug.c
@@ -15,7 +15,7 @@
*/
#include <linux/debugfs.h>
-#include "sync.h"
+#include "sync_debug.h"
#ifdef CONFIG_DEBUG_FS
diff --git a/drivers/staging/android/sync.h b/drivers/staging/android/sync_debug.h
index 48e2d1c..48e2d1c 100644
--- a/drivers/staging/android/sync.h
+++ b/drivers/staging/android/sync_debug.h
diff --git a/drivers/staging/android/trace/sync.h b/drivers/staging/android/trace/sync.h
index d7f6457f..6b5ce96 100644
--- a/drivers/staging/android/trace/sync.h
+++ b/drivers/staging/android/trace/sync.h
@@ -5,7 +5,7 @@
#if !defined(_TRACE_SYNC_H) || defined(TRACE_HEADER_MULTI_READ)
#define _TRACE_SYNC_H
-#include "../sync.h"
+#include "../sync_debug.h"
#include <linux/tracepoint.h>
TRACE_EVENT(sync_timeline,