From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 31 Mar 2020 09:00:23 +0000 (+0200)
Subject: Revert "ALSA: uapi: Drop asound.h inclusion from asoc.h"
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b6f69c795547f59ddf1db17cddbd2b9a15c656ed;p=linux.git

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>
---

diff --git a/include/uapi/sound/asoc.h b/include/uapi/sound/asoc.h
index 6048553c119d9..a74ca232f1fc1 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.