Merge branch 'devel' of git://git.alsa-project.org/alsa-kernel into topic/misc

diff --combined include/sound/pcm.h
index 07fd630db88dab19f1ccbc35e09b90f259843563,83c6fa6aac43cec7d2ae1139f1bba6b0bc392f01..304025b235201a82982dc45817f35fb38a21a2ad
--- 1/include/sound/pcm.h
--- 2/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@@ -174,10 -174,6 +174,10 @@@ struct snd_pcm_ops 
  #define SNDRV_PCM_FMTBIT_U18_3LE      (1ULL << SNDRV_PCM_FORMAT_U18_3LE)
  #define SNDRV_PCM_FMTBIT_S18_3BE      (1ULL << SNDRV_PCM_FORMAT_S18_3BE)
  #define SNDRV_PCM_FMTBIT_U18_3BE      (1ULL << SNDRV_PCM_FORMAT_U18_3BE)
 +#define SNDRV_PCM_FMTBIT_G723_24      (1ULL << SNDRV_PCM_FORMAT_G723_24)
 +#define SNDRV_PCM_FMTBIT_G723_24_1B   (1ULL << SNDRV_PCM_FORMAT_G723_24_1B)
 +#define SNDRV_PCM_FMTBIT_G723_40      (1ULL << SNDRV_PCM_FORMAT_G723_40)
 +#define SNDRV_PCM_FMTBIT_G723_40_1B   (1ULL << SNDRV_PCM_FORMAT_G723_40_1B)
  
  #ifdef SNDRV_LITTLE_ENDIAN
  #define SNDRV_PCM_FMTBIT_S16          SNDRV_PCM_FMTBIT_S16_LE
@@@ -317,7 -313,7 +317,7 @@@ struct snd_pcm_runtime 
        struct snd_pcm_mmap_control *control;
  
        /* -- locking / scheduling -- */
-       unsigned int twake: 1;          /* do transfer (!poll) wakeup */
+       snd_pcm_uframes_t twake;        /* do transfer (!poll) wakeup if non-zero */
        wait_queue_head_t sleep;        /* poll sleep */
        wait_queue_head_t tsleep;       /* transfer sleep */
        struct fasync_struct *fasync;