ASoC: soc.h: merge CONFIG_DEBUG_FS

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 21861f366dcb6b8628d8f5ae6310032eaf52f8c5..600a7ebd10c0d76f3e48e4628cd49dce3435fc9e 100644 (file)
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -831,10 +831,6 @@ struct snd_soc_component {
        /* attached dynamic objects */
        struct list_head dobj_list;
 
-#ifdef CONFIG_DEBUG_FS
-       struct dentry *debugfs_root;
-#endif
-
        /*
        * DO NOT use any of the fields below in drivers, they are temporary and
        * are going to be removed again soon. If you use them in driver code the
@@ -848,6 +844,7 @@ struct snd_soc_component {
        int (*init)(struct snd_soc_component *component);
 
 #ifdef CONFIG_DEBUG_FS
+       struct dentry *debugfs_root;
        const char *debugfs_prefix;
 #endif
 };