From: Gustavo Padovan <gustavo.padovan@xxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxx> --- drivers/staging/android/sw_sync.c | 2 +- drivers/staging/android/sync_debug.c | 2 +- drivers/staging/android/{sync.h => sync_debug.h} | 0 drivers/staging/android/trace/sync.h | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename drivers/staging/android/{sync.h => sync_debug.h} (100%) 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 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 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, -- 2.5.5 _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel