diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-08-27 15:10:22 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-08-27 15:10:22 -0400 |
| commit | 7eba6c05c5075f885f0b26244e1fdac76355f562 (patch) | |
| tree | e1939be6de4ebb9b866077c605006ef58b5e49f1 | |
| parent | e4b6b74ffd32d114227a5dcfe814e2cecd80554b (diff) | |
| parent | 708fafb3c54039caa5dadc8e9d2dfd999f88f190 (diff) | |
Merge branch 'for-2.6.36' into for-2.6.37
| -rw-r--r-- | sound/soc/soc-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 65352c7d4b7f..42542e0da2a3 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c | |||
| @@ -249,7 +249,7 @@ static void soc_init_codec_debugfs(struct snd_soc_codec *codec) | |||
| 249 | printk(KERN_WARNING | 249 | printk(KERN_WARNING |
| 250 | "ASoC: Failed to create codec register debugfs file\n"); | 250 | "ASoC: Failed to create codec register debugfs file\n"); |
| 251 | 251 | ||
| 252 | codec->debugfs_pop_time = debugfs_create_u32("dapm_pop_time", 0744, | 252 | codec->debugfs_pop_time = debugfs_create_u32("dapm_pop_time", 0644, |
| 253 | codec->debugfs_codec_root, | 253 | codec->debugfs_codec_root, |
| 254 | &codec->pop_time); | 254 | &codec->pop_time); |
| 255 | if (!codec->debugfs_pop_time) | 255 | if (!codec->debugfs_pop_time) |