diff options
author | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2016-04-28 10:46:57 -0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-29 17:37:10 -0700 |
commit | 460bfc41fd52959311ed0328163f785e023857af (patch) | |
tree | 314551febc87c2a8d4fadfd1e49e3ef4ab3add7e | |
parent | 92e06213f11a87effad8bdd4d910958b89eec044 (diff) | |
download | blackbird-op-linux-460bfc41fd52959311ed0328163f785e023857af.tar.gz blackbird-op-linux-460bfc41fd52959311ed0328163f785e023857af.zip |
dma-buf/sync_file: de-stage sync_file headers
Move sync_file headers file to include/ dir.
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/android/sync.h | 4 | ||||
-rw-r--r-- | drivers/staging/android/sync_debug.c | 2 | ||||
-rw-r--r-- | drivers/staging/android/sync_file.c | 4 | ||||
-rw-r--r-- | include/linux/sync_file.h (renamed from drivers/staging/android/sync_file.h) | 0 | ||||
-rw-r--r-- | include/uapi/linux/sync_file.h (renamed from drivers/staging/android/uapi/sync_file.h) | 0 |
5 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/android/sync.h b/drivers/staging/android/sync.h index df44abb95963..b56885c14839 100644 --- a/drivers/staging/android/sync.h +++ b/drivers/staging/android/sync.h @@ -20,8 +20,8 @@ #include <linux/spinlock.h> #include <linux/fence.h> -#include "sync_file.h" -#include "uapi/sync_file.h" +#include <linux/sync_file.h> +#include <uapi/linux/sync_file.h> struct sync_timeline; diff --git a/drivers/staging/android/sync_debug.c b/drivers/staging/android/sync_debug.c index 8b55218f5535..5f57499c98bf 100644 --- a/drivers/staging/android/sync_debug.c +++ b/drivers/staging/android/sync_debug.c @@ -26,7 +26,7 @@ #include <linux/uaccess.h> #include <linux/anon_inodes.h> #include <linux/time64.h> -#include "sync_file.h" +#include <linux/sync_file.h> #include "sw_sync.h" #ifdef CONFIG_DEBUG_FS diff --git a/drivers/staging/android/sync_file.c b/drivers/staging/android/sync_file.c index eabf90dd63b3..f08cf2d8309e 100644 --- a/drivers/staging/android/sync_file.c +++ b/drivers/staging/android/sync_file.c @@ -23,8 +23,8 @@ #include <linux/slab.h> #include <linux/uaccess.h> #include <linux/anon_inodes.h> -#include "sync_file.h" -#include "uapi/sync_file.h" +#include <linux/sync_file.h> +#include <uapi/linux/sync_file.h> static const struct file_operations sync_file_fops; diff --git a/drivers/staging/android/sync_file.h b/include/linux/sync_file.h index c6ffe8b0725c..c6ffe8b0725c 100644 --- a/drivers/staging/android/sync_file.h +++ b/include/linux/sync_file.h diff --git a/drivers/staging/android/uapi/sync_file.h b/include/uapi/linux/sync_file.h index 413303d37b56..413303d37b56 100644 --- a/drivers/staging/android/uapi/sync_file.h +++ b/include/uapi/linux/sync_file.h |