diff options
| author | Takashi Iwai <[email protected]> | 2019-07-01 17:01:00 +0200 |
|---|---|---|
| committer | Takashi Iwai <[email protected]> | 2019-07-01 17:01:55 +0200 |
| commit | b5c21c84705dbd96a0fff930d33022a17910b4f4 (patch) | |
| tree | a080aa4383c8f4ffb91225d234ac9b530b2ff0fa /include/uapi | |
| parent | 7c2b3629d09ddec810dc4c1d3a6657c32def8f71 (diff) | |
| parent | 7fbd1753b64eafe21cf842348a40a691d0dee440 (diff) | |
Merge branch 'for-linus' into for-next
This back-merge is necessary for adjusting the latest FireWire fix
with the recent refactoring in 5.3 development branch.
Signed-off-by: Takashi Iwai <[email protected]>
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/sound/sof/abi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/sound/sof/abi.h b/include/uapi/sound/sof/abi.h index 37e0a90dc9e6..0868eb47acf7 100644 --- a/include/uapi/sound/sof/abi.h +++ b/include/uapi/sound/sof/abi.h @@ -26,7 +26,7 @@ /* SOF ABI version major, minor and patch numbers */ #define SOF_ABI_MAJOR 3 -#define SOF_ABI_MINOR 4 +#define SOF_ABI_MINOR 6 #define SOF_ABI_PATCH 0 /* SOF ABI version number. Format within 32bit word is MMmmmppp */ |