staging/android: add DEBUG_FS dependence on Kconfig

SW_SYNC only works with DEBUG_FS so state it in the Kconfig file.

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Sumit Semwal <sumit.semwal@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/android/Kconfig b/drivers/staging/android/Kconfig
index f52c682ca3f72960d080e9bff199a138c01f0786..06e41d24ec62053c7f698b72ba4d6ca12f6e0f32 100644 (file)
--- a/drivers/staging/android/Kconfig
+++ b/drivers/staging/android/Kconfig
@@ -28,6 +28,7 @@ config SW_SYNC
        bool "Software synchronization framework"
        default n
        depends on SYNC_FILE
+       depends on DEBUG_FS
        ---help---
          A sync object driver that uses a 32bit counter to coordinate
          synchronization.  Useful when there is no hardware primitive backing

diff --git a/drivers/staging/android/sync_debug.c b/drivers/staging/android/sync_debug.c
index b76022623d8ab0b3c42f61877f99b26b6c816f67..903296988d416cabb6222c0d26920cd709ea1930 100644 (file)
--- a/drivers/staging/android/sync_debug.c
+++ b/drivers/staging/android/sync_debug.c
@@ -17,8 +17,6 @@
 #include <linux/debugfs.h>
 #include "sync_debug.h"
 
-#ifdef CONFIG_DEBUG_FS
-
 static struct dentry *dbgfs;
 
 static LIST_HEAD(sync_timeline_list_head);
@@ -225,5 +223,3 @@ void sync_dump(void)
                }
        }
 }
-
-#endif

diff --git a/drivers/staging/android/sync_debug.h b/drivers/staging/android/sync_debug.h
index 48e2d1c8c3ef44d1c957edb4c5536d081c98b611..425ebc5c32aa2afcc4965afb4efdbf2248463c52 100644 (file)
--- a/drivers/staging/android/sync_debug.h
+++ b/drivers/staging/android/sync_debug.h
@@ -41,9 +41,7 @@ struct sync_timeline {
 
        struct list_head        active_list_head;
 
-#ifdef CONFIG_DEBUG_FS
        struct list_head        sync_timeline_list;
-#endif
 };
 
 static inline struct sync_timeline *fence_parent(struct fence *fence)
@@ -64,7 +62,7 @@ struct sync_pt {
        struct list_head active_list;
 };
 
-#ifdef CONFIG_DEBUG_FS
+#ifdef CONFIG_SW_SYNC
 
 extern const struct file_operations sw_sync_debugfs_fops;