Merge branch 'topic/uapi-fix' into for-next

diff --combined include/uapi/sound/asound.h
index 0e88e7a0f0ebf227894f05ef6ed2225931b9d6d6,1fe3f4f3d6969915cf08166a6bb0cc553f16e777..fd5c0b55ca3bc9adf11b36d127045aaf7a8e4ba0
--- 1/include/uapi/sound/asound.h
--- 2/include/uapi/sound/asound.h
+++ b/include/uapi/sound/asound.h
@@@ -25,6 -25,9 +25,9 @@@
  
  #include <linux/types.h>
  
+ #ifndef __KERNEL__
+ #include <stdlib.h>
+ #endif
  
  /*
   *  protocol version
@@@ -268,7 -271,6 +271,7 @@@ typedef int __bitwise snd_pcm_subformat
  #define SNDRV_PCM_INFO_SYNC_START     0x00400000      /* pcm support some kind of sync go */
  #define SNDRV_PCM_INFO_NO_PERIOD_WAKEUP       0x00800000      /* period wakeup can be disabled */
  #define SNDRV_PCM_INFO_HAS_WALL_CLOCK   0x01000000      /* has audio wall clock for audio/system time sync */
 +#define SNDRV_PCM_INFO_DRAIN_TRIGGER  0x40000000              /* internal kernel flag - trigger in drain */
  #define SNDRV_PCM_INFO_FIFO_IN_FRAMES 0x80000000      /* internal kernel flag - FIFO size is in frames */
  
  typedef int __bitwise snd_pcm_state_t;