summaryrefslogtreecommitdiff
path: root/drivers/staging/android/sync.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/staging/android/sync.h')
-rw-r--r--drivers/staging/android/sync.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/staging/android/sync.h b/drivers/staging/android/sync.h
index 925fba5..ffc6df6 100644
--- a/drivers/staging/android/sync.h
+++ b/drivers/staging/android/sync.h
@@ -168,8 +168,6 @@ void sync_timeline_signal(struct sync_timeline *obj);
struct fence *sync_pt_create(struct sync_timeline *parent, int size);
struct sync_file *sync_file_create(const char *name, struct fence *fence);
-struct sync_file *sync_file_merge(const char *name,
- struct sync_file *a, struct sync_file *b);
struct sync_file *sync_file_fdget(int fd);
#ifdef CONFIG_DEBUG_FS