diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-09-10 10:27:43 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-09-10 10:28:00 +0200 |
| commit | 5516e3f4763e3604b789b3567dafe4388eec4a8f (patch) | |
| tree | c9f431037710140445cc18b672582a571c8e4c2f /include | |
| parent | 28fbfaf6bd1df94cccf1a5c009fe26b9bdccc2b6 (diff) | |
| parent | c491b044cf5f8236742887ba59b30032036e4ac8 (diff) | |
| download | linux-5516e3f4763e3604b789b3567dafe4388eec4a8f.tar.gz linux-5516e3f4763e3604b789b3567dafe4388eec4a8f.tar.bz2 linux-5516e3f4763e3604b789b3567dafe4388eec4a8f.zip | |
Merge branch 'for-linus' into for-next
Signed-off-by: Takashi Iwai <tiwai@suse.de>
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 |