diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-08-19 18:31:54 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-08-19 18:31:54 +0200 |
| commit | e24b6c03a17b20fb6473b3679f7423fae5731d05 (patch) | |
| tree | c2e82d3223248b2e71253e5b035c2ea38d4a8d76 /include/uapi/sound | |
| parent | 59a51a6b4b94ed6a11279b78a547e22d4b194c70 (diff) | |
| parent | 8c90503bf246bebb48caa5590d41df755ba08550 (diff) | |
| download | op-kernel-dev-e24b6c03a17b20fb6473b3679f7423fae5731d05.zip op-kernel-dev-e24b6c03a17b20fb6473b3679f7423fae5731d05.tar.gz | |
Merge tag 'asoc-v4.2-disable-topology' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Disable topology support for v4.2
The topology code merged in the v4.2 merge window introduced a new ABI
which was believed to be suitable for use but subsequently additional
work by the developers of this feature have revealed some problems that
need to be addressed. In order to allow this to be done without having
to support the initial ABI add Kconfig to disable the build and also add
some #error statements to the UAPI header so users can't use them.
Diffstat (limited to 'include/uapi/sound')
| -rw-r--r-- | include/uapi/sound/asoc.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/uapi/sound/asoc.h b/include/uapi/sound/asoc.h index 51b8066..247c50b 100644 --- a/include/uapi/sound/asoc.h +++ b/include/uapi/sound/asoc.h @@ -18,6 +18,12 @@ #include <linux/types.h> #include <sound/asound.h> +#ifndef __KERNEL__ +#error This API is an early revision and not enabled in the current +#error kernel release, it will be enabled in a future kernel version +#error with incompatible changes to what is here. +#endif + /* * Maximum number of channels topology kcontrol can represent. */ |
