aboutsummaryrefslogtreecommitdiffstats
path: root/sound/synth
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-01-28 11:24:43 -0500
committerTakashi Iwai <tiwai@suse.de>2015-01-28 11:25:07 -0500
commit976412fbc9855176ea7e02602a601b46c4479fcc (patch)
tree8f06fde284a151a2edb01abd04e786ae48274d9b /sound/synth
parent6cbbfe1c8ddb6ac1322a87795dff9d8712c3e359 (diff)
ALSA: Include linux/uaccess.h and linux/bitopts.h instead of asm/*
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/synth')
-rw-r--r--sound/synth/emux/emux_hwdep.c2
-rw-r--r--sound/synth/emux/emux_oss.c2
-rw-r--r--sound/synth/emux/soundfont.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/sound/synth/emux/emux_hwdep.c b/sound/synth/emux/emux_hwdep.c
index 5ae1eae9f6db..e557946718a9 100644
--- a/sound/synth/emux/emux_hwdep.c
+++ b/sound/synth/emux/emux_hwdep.c
@@ -21,7 +21,7 @@
21 21
22#include <sound/core.h> 22#include <sound/core.h>
23#include <sound/hwdep.h> 23#include <sound/hwdep.h>
24#include <asm/uaccess.h> 24#include <linux/uaccess.h>
25#include "emux_voice.h" 25#include "emux_voice.h"
26 26
27 27
diff --git a/sound/synth/emux/emux_oss.c b/sound/synth/emux/emux_oss.c
index 319754cf6208..ab37add269ae 100644
--- a/sound/synth/emux/emux_oss.c
+++ b/sound/synth/emux/emux_oss.c
@@ -26,7 +26,7 @@
26#ifdef CONFIG_SND_SEQUENCER_OSS 26#ifdef CONFIG_SND_SEQUENCER_OSS
27 27
28#include <linux/export.h> 28#include <linux/export.h>
29#include <asm/uaccess.h> 29#include <linux/uaccess.h>
30#include <sound/core.h> 30#include <sound/core.h>
31#include "emux_voice.h" 31#include "emux_voice.h"
32#include <sound/asoundef.h> 32#include <sound/asoundef.h>
diff --git a/sound/synth/emux/soundfont.c b/sound/synth/emux/soundfont.c
index 78683b2064f7..31a4ea94830e 100644
--- a/sound/synth/emux/soundfont.c
+++ b/sound/synth/emux/soundfont.c
@@ -25,7 +25,7 @@
25 * of doing things so that the old sfxload utility can be used. 25 * of doing things so that the old sfxload utility can be used.
26 * Everything may change when there is an alsa way of doing things. 26 * Everything may change when there is an alsa way of doing things.
27 */ 27 */
28#include <asm/uaccess.h> 28#include <linux/uaccess.h>
29#include <linux/slab.h> 29#include <linux/slab.h>
30#include <linux/export.h> 30#include <linux/export.h>
31#include <sound/core.h> 31#include <sound/core.h>