lkml.org 
[lkml]   [2016]   [Apr]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 10/13] dma-buf/sync_file: de-stage sync_file headers
    Date
    From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

    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>
    ---
    drivers/staging/android/sync.h | 4 ++--
    drivers/staging/android/sync_debug.c | 2 +-
    drivers/staging/android/sync_file.c | 4 ++--
    {drivers/staging/android => include/linux}/sync_file.h | 0
    {drivers/staging/android/uapi => include/uapi/linux}/sync_file.h | 0
    5 files changed, 5 insertions(+), 5 deletions(-)
    rename {drivers/staging/android => include/linux}/sync_file.h (100%)
    rename {drivers/staging/android/uapi => include/uapi/linux}/sync_file.h (100%)

    diff --git a/drivers/staging/android/sync.h b/drivers/staging/android/sync.h
    index df44abb..b56885c 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 8b55218..5f57499 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 eabf90d..f08cf2d 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
    similarity index 100%
    rename from drivers/staging/android/sync_file.h
    rename to include/linux/sync_file.h
    diff --git a/drivers/staging/android/uapi/sync_file.h b/include/uapi/linux/sync_file.h
    similarity index 100%
    rename from drivers/staging/android/uapi/sync_file.h
    rename to include/uapi/linux/sync_file.h
    --
    2.5.5
    \
     
     \ /
      Last update: 2016-04-28 16:01    [W:3.508 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site