From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Date: Tue, 31 May 2016 19:59:12 +0000 (-0300)
Subject: staging/android: rename sync.h to sync_debug.h
X-Git-Tag: v4.8-rc1~193^2~92
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1fe82e2e148697fd1fbbb2944e143b182c51e227;p=thirdparty%2Fkernel%2Flinux.git

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>
---

diff --git a/drivers/staging/android/sw_sync.c b/drivers/staging/android/sw_sync.c
index ae56eceeeaacc..115c9174705f1 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 b2697a12b4242..b76022623d8ab 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
similarity index 100%
rename from drivers/staging/android/sync.h
rename to drivers/staging/android/sync_debug.h
diff --git a/drivers/staging/android/trace/sync.h b/drivers/staging/android/trace/sync.h
index d7f6457f4b968..6b5ce9640ddda 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,