aboutsummaryrefslogtreecommitdiffstats
path: root/sound/synth
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-01-08 12:13:27 -0500
committerJaroslav Kysela <perex@perex.cz>2008-01-31 11:29:48 -0500
commit9004acc70e8c49c50c4c7b652f906f1e0ed5709d (patch)
treede504d87cc727b4ecab5718522ce94890f349149 /sound/synth
parent31e8960b35975ed235d283d6fb95d0e28dffded0 (diff)
[ALSA] Remove sound/driver.h
This header file exists only for some hacks to adapt alsa-driver tree. It's useless for building in the kernel. Let's move a few lines in it to sound/core.h and remove it. With this patch, sound/driver.h isn't removed but has just a single compile warning to include it. This should be really killed in future. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/synth')
-rw-r--r--sound/synth/emux/emux.c1
-rw-r--r--sound/synth/emux/emux_hwdep.c1
-rw-r--r--sound/synth/emux/emux_oss.c1
-rw-r--r--sound/synth/emux/emux_proc.c1
-rw-r--r--sound/synth/emux/emux_voice.h1
-rw-r--r--sound/synth/emux/soundfont.c1
-rw-r--r--sound/synth/util_mem.c1
7 files changed, 0 insertions, 7 deletions
diff --git a/sound/synth/emux/emux.c b/sound/synth/emux/emux.c
index ebcac13fd397..c89d2ea594b9 100644
--- a/sound/synth/emux/emux.c
+++ b/sound/synth/emux/emux.c
@@ -18,7 +18,6 @@
18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19 */ 19 */
20 20
21#include <sound/driver.h>
22#include <linux/wait.h> 21#include <linux/wait.h>
23#include <linux/slab.h> 22#include <linux/slab.h>
24#include <linux/string.h> 23#include <linux/string.h>
diff --git a/sound/synth/emux/emux_hwdep.c b/sound/synth/emux/emux_hwdep.c
index 9b63814c3f64..0a5391436add 100644
--- a/sound/synth/emux/emux_hwdep.c
+++ b/sound/synth/emux/emux_hwdep.c
@@ -19,7 +19,6 @@
19 * 19 *
20 */ 20 */
21 21
22#include <sound/driver.h>
23#include <sound/core.h> 22#include <sound/core.h>
24#include <sound/hwdep.h> 23#include <sound/hwdep.h>
25#include <asm/uaccess.h> 24#include <asm/uaccess.h>
diff --git a/sound/synth/emux/emux_oss.c b/sound/synth/emux/emux_oss.c
index 3436816727c8..f60a98ef7dec 100644
--- a/sound/synth/emux/emux_oss.c
+++ b/sound/synth/emux/emux_oss.c
@@ -22,7 +22,6 @@
22 * midi emulation. 22 * midi emulation.
23 */ 23 */
24 24
25#include <sound/driver.h>
26 25
27#ifdef CONFIG_SND_SEQUENCER_OSS 26#ifdef CONFIG_SND_SEQUENCER_OSS
28 27
diff --git a/sound/synth/emux/emux_proc.c b/sound/synth/emux/emux_proc.c
index 680f2b7fec20..687e6a13689e 100644
--- a/sound/synth/emux/emux_proc.c
+++ b/sound/synth/emux/emux_proc.c
@@ -18,7 +18,6 @@
18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19 */ 19 */
20 20
21#include <sound/driver.h>
22#include <linux/wait.h> 21#include <linux/wait.h>
23#include <linux/slab.h> 22#include <linux/slab.h>
24#include <sound/core.h> 23#include <sound/core.h>
diff --git a/sound/synth/emux/emux_voice.h b/sound/synth/emux/emux_voice.h
index 0a56ca18b165..09711f84ed30 100644
--- a/sound/synth/emux/emux_voice.h
+++ b/sound/synth/emux/emux_voice.h
@@ -22,7 +22,6 @@
22 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 22 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
23 */ 23 */
24 24
25#include <sound/driver.h>
26#include <linux/wait.h> 25#include <linux/wait.h>
27#include <linux/sched.h> 26#include <linux/sched.h>
28#include <sound/core.h> 27#include <sound/core.h>
diff --git a/sound/synth/emux/soundfont.c b/sound/synth/emux/soundfont.c
index 455e535933ec..36d53bd317ed 100644
--- a/sound/synth/emux/soundfont.c
+++ b/sound/synth/emux/soundfont.c
@@ -25,7 +25,6 @@
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 <sound/driver.h>
29#include <asm/uaccess.h> 28#include <asm/uaccess.h>
30#include <linux/slab.h> 29#include <linux/slab.h>
31#include <sound/core.h> 30#include <sound/core.h>
diff --git a/sound/synth/util_mem.c b/sound/synth/util_mem.c
index 6fc3d2b2519f..deabe5f899c4 100644
--- a/sound/synth/util_mem.c
+++ b/sound/synth/util_mem.c
@@ -19,7 +19,6 @@
19 */ 19 */
20 20
21#include <linux/mutex.h> 21#include <linux/mutex.h>
22#include <sound/driver.h>
23#include <linux/init.h> 22#include <linux/init.h>
24#include <linux/slab.h> 23#include <linux/slab.h>
25#include <sound/core.h> 24#include <sound/core.h>