ALSA: uapi: Add linux/types.h include back (but carefully)
A few uapi/sound/*.h headers have been corrected for recovering from the compile errors with the existing user-space code (alsa-lib) by the recent commits. OTOH, these introduced another regression, as now linux/types.h inclusion became mandatory for the uapi header checks. As a compromise, this patch re-adds linux/types.h inclusions again, but conditionally not to break other non-standard user-space stuff again. Fixes: 2e4688676392 ("ALSA: emu10k1: Make uapi/emu10k1.h compilable again") Fixes: d63e63d42107 ("ALSA: hdsp: Make uapi/hdsp.h compilable again") Fixes: 4fa406caf950 ("ALSA: hdspm: Drop linux/types.h inclusion in uapi header") Reported-by: kbuild test robot <lkp@intel.com> Link: https://lore.kernel.org/r/20191230212742.28925-1-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
@ -23,6 +23,10 @@
|
|||||||
#ifndef _UAPI__SOUND_EMU10K1_H
|
#ifndef _UAPI__SOUND_EMU10K1_H
|
||||||
#define _UAPI__SOUND_EMU10K1_H
|
#define _UAPI__SOUND_EMU10K1_H
|
||||||
|
|
||||||
|
#ifdef __linux__
|
||||||
|
#include <linux/types.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* ---- FX8010 ----
|
* ---- FX8010 ----
|
||||||
*/
|
*/
|
||||||
|
@ -20,6 +20,10 @@
|
|||||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#ifdef __linux__
|
||||||
|
#include <linux/types.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#define HDSP_MATRIX_MIXER_SIZE 2048
|
#define HDSP_MATRIX_MIXER_SIZE 2048
|
||||||
|
|
||||||
enum HDSP_IO_Type {
|
enum HDSP_IO_Type {
|
||||||
|
@ -21,6 +21,10 @@
|
|||||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#ifdef __linux__
|
||||||
|
#include <linux/types.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
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user