diff options
| author | Takashi Iwai <tiwai@suse.de> | 2020-03-31 11:00:23 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-04-08 09:11:08 +0200 |
| commit | 3b258ac8673325d9a8051b53e3e3ef358ef7500b (patch) | |
| tree | 3deaaffd88c6fee11deba024f69682fca18ac524 /include | |
| parent | 00082d7aaf8fbc2aef3a5979b8413325bbae1e27 (diff) | |
Revert "ALSA: uapi: Drop asound.h inclusion from asoc.h"
commit b6f69c795547f59ddf1db17cddbd2b9a15c656ed upstream.
This reverts commit 645c08f17f477915f6d900b767e789852f150054
which was reported to break the build a program using this header.
The original issue was addressed in the alsa-lib side recently, so we
can make the header more self-contained again.
Reported-by: Dmitry V. Levin <ldv@altlinux.org>
Fixes: 645c08f17f47 ("ALSA: uapi: Drop asound.h inclusion from asoc.h")
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20200331090023.8112-1-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/sound/asoc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/sound/asoc.h b/include/uapi/sound/asoc.h index 6048553c119d..a74ca232f1fc 100644 --- a/include/uapi/sound/asoc.h +++ b/include/uapi/sound/asoc.h @@ -17,6 +17,7 @@ #define __LINUX_UAPI_SND_ASOC_H #include <linux/types.h> +#include <sound/asound.h> /* * Maximum number of channels topology kcontrol can represent. |