diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-02-23 09:14:03 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-02-23 09:14:03 +0100 |
| commit | 88cacc57e879d29d626a66852fd982739dc7e6de (patch) | |
| tree | b937525edcb487e0f4bd845eddc78ea428745278 /include | |
| parent | 6176fadce29cf050806dc32538dc6ca3e32860b9 (diff) | |
| parent | b9956409c281931c74ba8d0a2b61a98076a58602 (diff) | |
Merge branch 'topic/uapi-fix' into for-next
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/sound/asequencer.h | 1 | ||||
| -rw-r--r-- | include/uapi/sound/asound.h | 3 | ||||
| -rw-r--r-- | include/uapi/sound/emu10k1.h | 3 | ||||
| -rw-r--r-- | include/uapi/sound/hdspm.h | 6 |
4 files changed, 11 insertions, 2 deletions
diff --git a/include/uapi/sound/asequencer.h b/include/uapi/sound/asequencer.h index 09c8a00ea503..5a5fa4956ebd 100644 --- a/include/uapi/sound/asequencer.h +++ b/include/uapi/sound/asequencer.h @@ -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) diff --git a/include/uapi/sound/asound.h b/include/uapi/sound/asound.h index 0e88e7a0f0eb..fd5c0b55ca3b 100644 --- a/include/uapi/sound/asound.h +++ b/include/uapi/sound/asound.h @@ -25,6 +25,9 @@ #include <linux/types.h> +#ifndef __KERNEL__ +#include <stdlib.h> +#endif /* * protocol version diff --git a/include/uapi/sound/emu10k1.h b/include/uapi/sound/emu10k1.h index d1bbaf78457a..ec1535bb6aed 100644 --- a/include/uapi/sound/emu10k1.h +++ b/include/uapi/sound/emu10k1.h @@ -23,8 +23,7 @@ #define _UAPI__SOUND_EMU10K1_H #include <linux/types.h> - - +#include <sound/asound.h> /* * ---- FX8010 ---- diff --git a/include/uapi/sound/hdspm.h b/include/uapi/sound/hdspm.h index b357f1a5e29c..5737332d38f2 100644 --- a/include/uapi/sound/hdspm.h +++ b/include/uapi/sound/hdspm.h @@ -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 |