summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-03-07 11:09:25 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-03-07 11:13:56 +0000
commita2721fd9fa6d4181fd66c58316d3893b597ba118 (patch)
tree1cb73aedf98725fbd02eea1a2ce5823df6ee4580 /sound/soc
parent20d660653a488c1c88db6fe51c2459e00cb79230 (diff)
downloadlinux-3.10-a2721fd9fa6d4181fd66c58316d3893b597ba118.tar.gz
linux-3.10-a2721fd9fa6d4181fd66c58316d3893b597ba118.tar.bz2
linux-3.10-a2721fd9fa6d4181fd66c58316d3893b597ba118.zip
ASoC: Add missing debugfs conditionals
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/soc-core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 8926d38fc5a..be34f6b9538 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1879,6 +1879,7 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card)
snd_soc_dapm_add_routes(&card->dapm, card->dapm_routes,
card->num_dapm_routes);
+#ifdef CONFIG_DEBUG_FS
card->dapm.debugfs_dapm = debugfs_create_dir("dapm",
card->debugfs_card_root);
if (!card->dapm.debugfs_dapm)
@@ -1886,6 +1887,7 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card)
"Failed to create card DAPM debugfs directory\n");
snd_soc_dapm_debugfs_init(&card->dapm);
+#endif
snprintf(card->snd_card->shortname, sizeof(card->snd_card->shortname),
"%s", card->name);