diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2019-12-20 16:34:12 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-12-20 16:45:10 +0100 |
| commit | d63e63d4210713ddc7eb1b2d2afc4a8d42ccf91e (patch) | |
| tree | 4c55b3ff63e8c43b48f06545972fec4715aa1398 /include/uapi/sound | |
| parent | ALSA: emu10k1: Make uapi/emu10k1.h compilable again (diff) | |
| download | wireguard-linux-d63e63d4210713ddc7eb1b2d2afc4a8d42ccf91e.tar.xz wireguard-linux-d63e63d4210713ddc7eb1b2d2afc4a8d42ccf91e.zip | |
ALSA: hdsp: Make uapi/hdsp.h compilable again
Recently alsa-lib updated its content of sound/hdsp.h just by copying
the latest Linus kernel uapi/*.h, and this broke the build of
alsa-tools programs. We used to modify the headers so that they can
be built without asoundlib.h and linux kernel headers, and the
verbatim copy doesn't work as is.
This patch removes again the linux/types.h inclusion and drop __user
prefix that broke the build and adjusts the corresponding code.
Link: https://lore.kernel.org/r/20191220153415.2740-3-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/uapi/sound')
| -rw-r--r-- | include/uapi/sound/hdsp.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/uapi/sound/hdsp.h b/include/uapi/sound/hdsp.h index 5dc0c3db0a4c..88c92a3fb477 100644 --- a/include/uapi/sound/hdsp.h +++ b/include/uapi/sound/hdsp.h @@ -20,8 +20,6 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <linux/types.h> - #define HDSP_MATRIX_MIXER_SIZE 2048 enum HDSP_IO_Type { @@ -74,7 +72,7 @@ struct hdsp_config_info { #define SNDRV_HDSP_IOCTL_GET_CONFIG_INFO _IOR('H', 0x41, struct hdsp_config_info) struct hdsp_firmware { - void __user *firmware_data; /* 24413 x 4 bytes */ + void *firmware_data; /* 24413 x 4 bytes */ }; #define SNDRV_HDSP_IOCTL_UPLOAD_FIRMWARE _IOW('H', 0x42, struct hdsp_firmware) |