Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88cacc57 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

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

parents 6176fadc b9956409

include/uapi/sound/asequencer.h

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#ifndef _UAPI__SOUND_ASEQUENCER_H

#define _UAPI__SOUND_ASEQUENCER_H



#include <sound/asound.h>



/** version of the sequencer */

#define SNDRV_SEQ_VERSION SNDRV_PROTOCOL_VERSION (1, 0, 1)

include/uapi/sound/asound.h

+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ 


#include <linux/types.h>



#ifndef __KERNEL__

#include <stdlib.h>

#endif



/*

 *  protocol version

include/uapi/sound/emu10k1.h

+1 −2
Original line number Diff line number Diff line
@@ -23,8 +23,7 @@ 
#define _UAPI__SOUND_EMU10K1_H



#include <linux/types.h>





#include <sound/asound.h>



/*

 * ---- FX8010 ----

include/uapi/sound/hdspm.h

+6 −0
Original line number Diff line number Diff line
@@ -20,6 +20,12 @@ 
 *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

 */



#ifdef __KERNEL__

#include <linux/types.h>

#else

#include <stdint.h>

#endif



/* Maximum channels is 64 even on 56Mode you have 64playbacks to matrix */

#define HDSPM_MAX_CHANNELS      64