diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-09-06 08:24:56 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-09-06 08:24:56 +0200 |
| commit | c491b044cf5f8236742887ba59b30032036e4ac8 (patch) | |
| tree | d89c4626355f95e30f568f2cd7afec6952324c92 /include | |
| parent | a83e4c97ddd7473406ec5e1df8d5e7b24bd7e892 (diff) | |
| parent | 77212f300bfd6fb3edaabd1daf863cabb521854a (diff) | |
Merge tag 'asoc-fix-v6.11-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.11
A larger set of fixes than I'd like at this point, but mainly due to
people working on fixing module autoloading by adding missing exports of
ID tables rather than anything particularly concerning. There are some
other runtime fixes and quirks, and a tweak to the ABI definition for
SOF which ensures that a struct layout doesn't vary depending on the
architecture of the host.
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/sof/topology.h | 2 | ||||
| -rw-r--r-- | include/uapi/sound/sof/abi.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/sound/sof/topology.h b/include/sound/sof/topology.h index 3ba086f61983..449e93c25184 100644 --- a/include/sound/sof/topology.h +++ b/include/sound/sof/topology.h @@ -54,7 +54,7 @@ enum sof_comp_type { struct sof_ipc_comp { struct sof_ipc_cmd_hdr hdr; uint32_t id; - enum sof_comp_type type; + uint32_t type; uint32_t pipeline_id; uint32_t core; diff --git a/include/uapi/sound/sof/abi.h b/include/uapi/sound/sof/abi.h index 937ed9408c23..c1b158ec5dab 100644 --- a/include/uapi/sound/sof/abi.h +++ b/include/uapi/sound/sof/abi.h @@ -29,7 +29,7 @@ /* SOF ABI version major, minor and patch numbers */ #define SOF_ABI_MAJOR 3 #define SOF_ABI_MINOR 23 -#define SOF_ABI_PATCH 0 +#define SOF_ABI_PATCH 1 /* SOF ABI version number. Format within 32bit word is MMmmmppp */ #define SOF_ABI_MAJOR_SHIFT 24 |