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

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

parents 6176fadc b9956409
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#ifndef _UAPI__SOUND_ASEQUENCER_H #ifndef _UAPI__SOUND_ASEQUENCER_H
#define _UAPI__SOUND_ASEQUENCER_H #define _UAPI__SOUND_ASEQUENCER_H
#include <sound/asound.h>
/** version of the sequencer */ /** version of the sequencer */
#define SNDRV_SEQ_VERSION SNDRV_PROTOCOL_VERSION (1, 0, 1) #define SNDRV_SEQ_VERSION SNDRV_PROTOCOL_VERSION (1, 0, 1)
......
...@@ -25,6 +25,9 @@ ...@@ -25,6 +25,9 @@
#include <linux/types.h> #include <linux/types.h>
#ifndef __KERNEL__
#include <stdlib.h>
#endif
/* /*
* protocol version * protocol version
......
...@@ -23,8 +23,7 @@ ...@@ -23,8 +23,7 @@
#define _UAPI__SOUND_EMU10K1_H #define _UAPI__SOUND_EMU10K1_H
#include <linux/types.h> #include <linux/types.h>
#include <sound/asound.h>
/* /*
* ---- FX8010 ---- * ---- FX8010 ----
......
...@@ -20,6 +20,12 @@ ...@@ -20,6 +20,12 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * 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 */ /* Maximum channels is 64 even on 56Mode you have 64playbacks to matrix */
#define HDSPM_MAX_CHANNELS 64 #define HDSPM_MAX_CHANNELS 64
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment