Merge remote-tracking branch 'asoc/fix/topology-abi' into asoc-linus
authorMark Brown <broonie@kernel.org>
Fri, 4 Nov 2016 18:34:05 +0000 (12:34 -0600)
committerMark Brown <broonie@kernel.org>
Fri, 4 Nov 2016 18:34:05 +0000 (12:34 -0600)
include/uapi/sound/asoc.h

index 33d00a4ce6567f03f1cb52b08a5e72bda04efbaf..819d895edfdca7f9b146f187b0636410eb5bde7f 100644 (file)
 #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.
  */