diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-24 06:24:02 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-24 06:24:02 -0400 |
| commit | d6ee232c7f763646ad00dd948a0c2fbedaa63ec6 (patch) | |
| tree | 8f87c29db7eb4ecfb57793e8bcada34bfb1637f6 /include/trace | |
| parent | 618056167059afdf43a36aa9db40e51a6482797d (diff) | |
| parent | 6833c452c2fb47353566aa705d68541c6045c796 (diff) | |
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/events/asoc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/trace/events/asoc.h b/include/trace/events/asoc.h index 5fc2dcdd21cd..03996b2bb04f 100644 --- a/include/trace/events/asoc.h +++ b/include/trace/events/asoc.h | |||
| @@ -14,6 +14,7 @@ struct snd_soc_codec; | |||
| 14 | struct snd_soc_platform; | 14 | struct snd_soc_platform; |
| 15 | struct snd_soc_card; | 15 | struct snd_soc_card; |
| 16 | struct snd_soc_dapm_widget; | 16 | struct snd_soc_dapm_widget; |
| 17 | struct snd_soc_dapm_path; | ||
| 17 | 18 | ||
| 18 | /* | 19 | /* |
| 19 | * Log register events | 20 | * Log register events |