diff options
author | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2016-04-28 09:46:57 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-29 20:37:10 -0400 |
commit | 460bfc41fd52959311ed0328163f785e023857af (patch) | |
tree | 314551febc87c2a8d4fadfd1e49e3ef4ab3add7e | |
parent | 92e06213f11a87effad8bdd4d910958b89eec044 (diff) |
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 @@ | |||
20 | #include <linux/spinlock.h> | 20 | #include <linux/spinlock.h> |
21 | #include <linux/fence.h> | 21 | #include <linux/fence.h> |
22 | 22 | ||
23 | #include "sync_file.h" | 23 | #include <linux/sync_file.h> |
24 | #include "uapi/sync_file.h" | 24 | #include <uapi/linux/sync_file.h> |
25 | 25 | ||
26 | struct sync_timeline; | 26 | struct sync_timeline; |
27 | 27 | ||
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 @@ | |||
26 | #include <linux/uaccess.h> | 26 | #include <linux/uaccess.h> |
27 | #include <linux/anon_inodes.h> | 27 | #include <linux/anon_inodes.h> |
28 | #include <linux/time64.h> | 28 | #include <linux/time64.h> |
29 | #include "sync_file.h" | 29 | #include <linux/sync_file.h> |
30 | #include "sw_sync.h" | 30 | #include "sw_sync.h" |
31 | 31 | ||
32 | #ifdef CONFIG_DEBUG_FS | 32 | #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 @@ | |||
23 | #include <linux/slab.h> | 23 | #include <linux/slab.h> |
24 | #include <linux/uaccess.h> | 24 | #include <linux/uaccess.h> |
25 | #include <linux/anon_inodes.h> | 25 | #include <linux/anon_inodes.h> |
26 | #include "sync_file.h" | 26 | #include <linux/sync_file.h> |
27 | #include "uapi/sync_file.h" | 27 | #include <uapi/linux/sync_file.h> |
28 | 28 | ||
29 | static const struct file_operations sync_file_fops; | 29 | static const struct file_operations sync_file_fops; |
30 | 30 | ||
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 | |||