diff options
author | Mark Brown <broonie@kernel.org> | 2020-12-04 21:39:45 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2020-12-04 21:39:45 +0100 |
commit | 4ecc08b2f51d874f35185724eda769492b60a18d (patch) | |
tree | f4d9e97304e9ff423fd4efa5193a1b94ebfc5912 /include/uapi/sound | |
parent | ASoC: bindings: fsl-asoc-card: add compatible string for si476x codec (diff) | |
parent | driver core: auxiliary bus: minor coding style tweaks (diff) | |
download | linux-4ecc08b2f51d874f35185724eda769492b60a18d.tar.xz linux-4ecc08b2f51d874f35185724eda769492b60a18d.zip |
Merge tag 'auxbus-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core into asoc-5.11
Auxiliary Bus support tag for 5.11-rc1
This is a signed tag for other subsystems to be able to pull in the
auxiliary bus support into their trees for the 5.11-rc1 merge.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/uapi/sound')
-rw-r--r-- | include/uapi/sound/compress_offload.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/sound/compress_offload.h b/include/uapi/sound/compress_offload.h index 7184265c0b0d..9555f31c8425 100644 --- a/include/uapi/sound/compress_offload.h +++ b/include/uapi/sound/compress_offload.h @@ -144,7 +144,7 @@ struct snd_compr_metadata { __u32 value[8]; } __attribute__((packed, aligned(4))); -/** +/* * compress path ioctl definitions * SNDRV_COMPRESS_GET_CAPS: Query capability of DSP * SNDRV_COMPRESS_GET_CODEC_CAPS: Query capability of a codec |