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

Commit 846ffba2 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "uapi: sound: remove redundant QGKI config checks"

parents 1d6e0d80 ec5cd505

include/uapi/sound/asound.h

+0 −6
Original line number Diff line number Diff line
@@ -112,21 +112,15 @@ enum { 
	SNDRV_HWDEP_IFACE_LINE6,	/* Line6 USB processors */

	SNDRV_HWDEP_IFACE_FW_MOTU,	/* MOTU FireWire series */

	SNDRV_HWDEP_IFACE_FW_FIREFACE,	/* RME Fireface series */

#ifdef CONFIG_AUDIO_QGKI

	SNDRV_HWDEP_IFACE_AUDIO_BE,	/* Backend Audio Control */

	SNDRV_HWDEP_IFACE_AUDIO_CODEC,  /* codec Audio Control */



	/* Don't forget to change the following: */

	SNDRV_HWDEP_IFACE_LAST = SNDRV_HWDEP_IFACE_AUDIO_CODEC

#else

	SNDRV_HWDEP_IFACE_LAST = SNDRV_HWDEP_IFACE_FW_FIREFACE

#endif

};



#ifdef CONFIG_AUDIO_QGKI

#define SNDRV_HWDEP_IFACE_AUDIO_BE SNDRV_HWDEP_IFACE_AUDIO_BE

#define SNDRV_HWDEP_IFACE_AUDIO_CODEC SNDRV_HWDEP_IFACE_AUDIO_CODEC

#endif



struct snd_hwdep_info {

	unsigned int device;		/* WR: device number */