Merge branch 'for-2.6.36' into for-2.6.37
This commit is contained in:
commit
7eba6c05c5
@ -249,7 +249,7 @@ static void soc_init_codec_debugfs(struct snd_soc_codec *codec)
|
|||||||
printk(KERN_WARNING
|
printk(KERN_WARNING
|
||||||
"ASoC: Failed to create codec register debugfs file\n");
|
"ASoC: Failed to create codec register debugfs file\n");
|
||||||
|
|
||||||
codec->debugfs_pop_time = debugfs_create_u32("dapm_pop_time", 0744,
|
codec->debugfs_pop_time = debugfs_create_u32("dapm_pop_time", 0644,
|
||||||
codec->debugfs_codec_root,
|
codec->debugfs_codec_root,
|
||||||
&codec->pop_time);
|
&codec->pop_time);
|
||||||
if (!codec->debugfs_pop_time)
|
if (!codec->debugfs_pop_time)
|
||||||
|
Loading…
Reference in New Issue
Block a user