diff options
| author | Mark Brown <broonie@kernel.org> | 2018-12-18 07:23:59 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-12-18 07:23:59 -0500 |
| commit | a7a850dba82498a1e050d8d153cae67ce0edb3b2 (patch) | |
| tree | f2b50444022ad27f407e087a820ae5ff248e0492 /include/linux/platform_data | |
| parent | c5fd9e77be44360b4827069c59f524815517917b (diff) | |
| parent | 0f4967bc21de0bb9e107f9ad3ced852daf66acd2 (diff) | |
Merge branch 'asoc-4.21' into asoc-next
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/davinci_asp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/platform_data/davinci_asp.h b/include/linux/platform_data/davinci_asp.h index 85ad68f9206a..7fe80f1c7e08 100644 --- a/include/linux/platform_data/davinci_asp.h +++ b/include/linux/platform_data/davinci_asp.h | |||
| @@ -79,6 +79,7 @@ struct davinci_mcasp_pdata { | |||
| 79 | /* McASP specific fields */ | 79 | /* McASP specific fields */ |
| 80 | int tdm_slots; | 80 | int tdm_slots; |
| 81 | u8 op_mode; | 81 | u8 op_mode; |
| 82 | u8 dismod; | ||
| 82 | u8 num_serializer; | 83 | u8 num_serializer; |
| 83 | u8 *serial_dir; | 84 | u8 *serial_dir; |
| 84 | u8 version; | 85 | u8 version; |