summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2020-03-31 11:00:23 +0200
committerTakashi Iwai <tiwai@suse.de>2020-03-31 11:01:12 +0200
commitb6f69c795547f59ddf1db17cddbd2b9a15c656ed (patch)
treea3f2e0855aeb4b6cae14575fcac774410cdf2104 /include
parentf36938aa7440f46a0a365f1cfde5f5985af2bef3 (diff)
downloadlinux-b6f69c795547f59ddf1db17cddbd2b9a15c656ed.tar.bz2
Revert "ALSA: uapi: Drop asound.h inclusion from asoc.h"
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>
Diffstat (limited to 'include')
-rw-r--r--include/uapi/sound/asoc.h1
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.