summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-11-04 21:34:05 +0300
committerMark Brown <broonie@kernel.org>2016-11-04 21:34:05 +0300
commit0b203d699e08424288b5f3eab1347143dd5d1e68 (patch)
tree7e07960f43f7a6c985f75ee5b629121e9799bfdb /include
parent3dfd2b682b79bde2c4ebbb7ed9f4dc90c0eb4677 (diff)
parent7c45e3cc6a59fb00edea65dfb6d3ae60403e4539 (diff)
downloadlinux-0b203d699e08424288b5f3eab1347143dd5d1e68.tar.xz
Merge remote-tracking branch 'asoc/fix/topology-abi' into asoc-linus
Diffstat (limited to 'include')
-rw-r--r--include/uapi/sound/asoc.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/include/uapi/sound/asoc.h b/include/uapi/sound/asoc.h
index 33d00a4ce656..819d895edfdc 100644
--- a/include/uapi/sound/asoc.h
+++ b/include/uapi/sound/asoc.h
@@ -18,12 +18,6 @@
#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.
*/