diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-01-08 12:13:27 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-01-31 11:29:48 -0500 |
commit | 9004acc70e8c49c50c4c7b652f906f1e0ed5709d (patch) | |
tree | de504d87cc727b4ecab5718522ce94890f349149 /sound/core/seq | |
parent | 31e8960b35975ed235d283d6fb95d0e28dffded0 (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/core/seq')
-rw-r--r-- | sound/core/seq/oss/seq_oss.c | 1 | ||||
-rw-r--r-- | sound/core/seq/oss/seq_oss_device.h | 1 | ||||
-rw-r--r-- | sound/core/seq/seq.c | 1 | ||||
-rw-r--r-- | sound/core/seq/seq_clientmgr.c | 1 | ||||
-rw-r--r-- | sound/core/seq/seq_device.c | 1 | ||||
-rw-r--r-- | sound/core/seq/seq_dummy.c | 1 | ||||
-rw-r--r-- | sound/core/seq/seq_fifo.c | 1 | ||||
-rw-r--r-- | sound/core/seq/seq_info.c | 1 | ||||
-rw-r--r-- | sound/core/seq/seq_lock.c | 1 | ||||
-rw-r--r-- | sound/core/seq/seq_memory.c | 1 | ||||
-rw-r--r-- | sound/core/seq/seq_midi.c | 1 | ||||
-rw-r--r-- | sound/core/seq/seq_midi_emul.c | 1 | ||||
-rw-r--r-- | sound/core/seq/seq_midi_event.c | 1 | ||||
-rw-r--r-- | sound/core/seq/seq_ports.c | 1 | ||||
-rw-r--r-- | sound/core/seq/seq_prioq.c | 1 | ||||
-rw-r--r-- | sound/core/seq/seq_queue.c | 1 | ||||
-rw-r--r-- | sound/core/seq/seq_system.c | 1 | ||||
-rw-r--r-- | sound/core/seq/seq_timer.c | 1 | ||||
-rw-r--r-- | sound/core/seq/seq_virmidi.c | 1 |
19 files changed, 0 insertions, 19 deletions
diff --git a/sound/core/seq/oss/seq_oss.c b/sound/core/seq/oss/seq_oss.c index bc0992398461..777796e94490 100644 --- a/sound/core/seq/oss/seq_oss.c +++ b/sound/core/seq/oss/seq_oss.c | |||
@@ -20,7 +20,6 @@ | |||
20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <sound/driver.h> | ||
24 | #include <linux/init.h> | 23 | #include <linux/init.h> |
25 | #include <linux/moduleparam.h> | 24 | #include <linux/moduleparam.h> |
26 | #include <linux/mutex.h> | 25 | #include <linux/mutex.h> |
diff --git a/sound/core/seq/oss/seq_oss_device.h b/sound/core/seq/oss/seq_oss_device.h index 9a8567c928ec..bf8d2b4cb15e 100644 --- a/sound/core/seq/oss/seq_oss_device.h +++ b/sound/core/seq/oss/seq_oss_device.h | |||
@@ -21,7 +21,6 @@ | |||
21 | #ifndef __SEQ_OSS_DEVICE_H | 21 | #ifndef __SEQ_OSS_DEVICE_H |
22 | #define __SEQ_OSS_DEVICE_H | 22 | #define __SEQ_OSS_DEVICE_H |
23 | 23 | ||
24 | #include <sound/driver.h> | ||
25 | #include <linux/time.h> | 24 | #include <linux/time.h> |
26 | #include <linux/wait.h> | 25 | #include <linux/wait.h> |
27 | #include <linux/slab.h> | 26 | #include <linux/slab.h> |
diff --git a/sound/core/seq/seq.c b/sound/core/seq/seq.c index 1878208a8026..ee0f8405ab35 100644 --- a/sound/core/seq/seq.c +++ b/sound/core/seq/seq.c | |||
@@ -19,7 +19,6 @@ | |||
19 | * | 19 | * |
20 | */ | 20 | */ |
21 | 21 | ||
22 | #include <sound/driver.h> | ||
23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
24 | #include <linux/moduleparam.h> | 23 | #include <linux/moduleparam.h> |
25 | #include <sound/core.h> | 24 | #include <sound/core.h> |
diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c index 6444bd8c0fdf..f97c1ba43a28 100644 --- a/sound/core/seq/seq_clientmgr.c +++ b/sound/core/seq/seq_clientmgr.c | |||
@@ -21,7 +21,6 @@ | |||
21 | * | 21 | * |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include <sound/driver.h> | ||
25 | #include <linux/init.h> | 24 | #include <linux/init.h> |
26 | #include <linux/slab.h> | 25 | #include <linux/slab.h> |
27 | #include <sound/core.h> | 26 | #include <sound/core.h> |
diff --git a/sound/core/seq/seq_device.c b/sound/core/seq/seq_device.c index 37852cdace76..155dc7da4722 100644 --- a/sound/core/seq/seq_device.c +++ b/sound/core/seq/seq_device.c | |||
@@ -36,7 +36,6 @@ | |||
36 | * | 36 | * |
37 | */ | 37 | */ |
38 | 38 | ||
39 | #include <sound/driver.h> | ||
40 | #include <linux/init.h> | 39 | #include <linux/init.h> |
41 | #include <sound/core.h> | 40 | #include <sound/core.h> |
42 | #include <sound/info.h> | 41 | #include <sound/info.h> |
diff --git a/sound/core/seq/seq_dummy.c b/sound/core/seq/seq_dummy.c index e55488d1237c..f3bdc54b429a 100644 --- a/sound/core/seq/seq_dummy.c +++ b/sound/core/seq/seq_dummy.c | |||
@@ -18,7 +18,6 @@ | |||
18 | * | 18 | * |
19 | */ | 19 | */ |
20 | 20 | ||
21 | #include <sound/driver.h> | ||
22 | #include <linux/init.h> | 21 | #include <linux/init.h> |
23 | #include <linux/slab.h> | 22 | #include <linux/slab.h> |
24 | #include <linux/moduleparam.h> | 23 | #include <linux/moduleparam.h> |
diff --git a/sound/core/seq/seq_fifo.c b/sound/core/seq/seq_fifo.c index 6b055aed7a4b..3a94ed021bd9 100644 --- a/sound/core/seq/seq_fifo.c +++ b/sound/core/seq/seq_fifo.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 <linux/slab.h> | 23 | #include <linux/slab.h> |
25 | #include "seq_fifo.h" | 24 | #include "seq_fifo.h" |
diff --git a/sound/core/seq/seq_info.c b/sound/core/seq/seq_info.c index 8a7fe5cca1c9..201f8106ffdd 100644 --- a/sound/core/seq/seq_info.c +++ b/sound/core/seq/seq_info.c | |||
@@ -19,7 +19,6 @@ | |||
19 | * | 19 | * |
20 | */ | 20 | */ |
21 | 21 | ||
22 | #include <sound/driver.h> | ||
23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
24 | #include <sound/core.h> | 23 | #include <sound/core.h> |
25 | 24 | ||
diff --git a/sound/core/seq/seq_lock.c b/sound/core/seq/seq_lock.c index 1a34941d4217..54f921edda79 100644 --- a/sound/core/seq/seq_lock.c +++ b/sound/core/seq/seq_lock.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 "seq_lock.h" | 23 | #include "seq_lock.h" |
25 | 24 | ||
diff --git a/sound/core/seq/seq_memory.c b/sound/core/seq/seq_memory.c index a72a1945bf8a..0cf6ac477318 100644 --- a/sound/core/seq/seq_memory.c +++ b/sound/core/seq/seq_memory.c | |||
@@ -20,7 +20,6 @@ | |||
20 | * | 20 | * |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <sound/driver.h> | ||
24 | #include <linux/init.h> | 23 | #include <linux/init.h> |
25 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
26 | #include <linux/vmalloc.h> | 25 | #include <linux/vmalloc.h> |
diff --git a/sound/core/seq/seq_midi.c b/sound/core/seq/seq_midi.c index 5929aaf1df9d..99b35360c506 100644 --- a/sound/core/seq/seq_midi.c +++ b/sound/core/seq/seq_midi.c | |||
@@ -26,7 +26,6 @@ Possible options for midisynth module: | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | 28 | ||
29 | #include <sound/driver.h> | ||
30 | #include <linux/init.h> | 29 | #include <linux/init.h> |
31 | #include <linux/slab.h> | 30 | #include <linux/slab.h> |
32 | #include <linux/errno.h> | 31 | #include <linux/errno.h> |
diff --git a/sound/core/seq/seq_midi_emul.c b/sound/core/seq/seq_midi_emul.c index 6645fc544621..07c663135c62 100644 --- a/sound/core/seq/seq_midi_emul.c +++ b/sound/core/seq/seq_midi_emul.c | |||
@@ -29,7 +29,6 @@ | |||
29 | * code in here. If there is it should be reported as a bug. | 29 | * code in here. If there is it should be reported as a bug. |
30 | */ | 30 | */ |
31 | 31 | ||
32 | #include <sound/driver.h> | ||
33 | #include <linux/init.h> | 32 | #include <linux/init.h> |
34 | #include <linux/slab.h> | 33 | #include <linux/slab.h> |
35 | #include <linux/string.h> | 34 | #include <linux/string.h> |
diff --git a/sound/core/seq/seq_midi_event.c b/sound/core/seq/seq_midi_event.c index b6820a5a73fc..8284f176a342 100644 --- a/sound/core/seq/seq_midi_event.c +++ b/sound/core/seq/seq_midi_event.c | |||
@@ -19,7 +19,6 @@ | |||
19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
20 | */ | 20 | */ |
21 | 21 | ||
22 | #include <sound/driver.h> | ||
23 | #include <linux/slab.h> | 22 | #include <linux/slab.h> |
24 | #include <linux/errno.h> | 23 | #include <linux/errno.h> |
25 | #include <linux/string.h> | 24 | #include <linux/string.h> |
diff --git a/sound/core/seq/seq_ports.c b/sound/core/seq/seq_ports.c index b6e23ad12ab9..1c32a53d6bd8 100644 --- a/sound/core/seq/seq_ports.c +++ b/sound/core/seq/seq_ports.c | |||
@@ -20,7 +20,6 @@ | |||
20 | * | 20 | * |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <sound/driver.h> | ||
24 | #include <sound/core.h> | 23 | #include <sound/core.h> |
25 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
26 | #include "seq_system.h" | 25 | #include "seq_system.h" |
diff --git a/sound/core/seq/seq_prioq.c b/sound/core/seq/seq_prioq.c index 074418617ee9..85969db576c9 100644 --- a/sound/core/seq/seq_prioq.c +++ b/sound/core/seq/seq_prioq.c | |||
@@ -19,7 +19,6 @@ | |||
19 | * | 19 | * |
20 | */ | 20 | */ |
21 | 21 | ||
22 | #include <sound/driver.h> | ||
23 | #include <linux/time.h> | 22 | #include <linux/time.h> |
24 | #include <linux/slab.h> | 23 | #include <linux/slab.h> |
25 | #include <sound/core.h> | 24 | #include <sound/core.h> |
diff --git a/sound/core/seq/seq_queue.c b/sound/core/seq/seq_queue.c index 9b87bb0c7f33..4a48c6ee8ee8 100644 --- a/sound/core/seq/seq_queue.c +++ b/sound/core/seq/seq_queue.c | |||
@@ -35,7 +35,6 @@ | |||
35 | * - Addition of experimental sync support. | 35 | * - Addition of experimental sync support. |
36 | */ | 36 | */ |
37 | 37 | ||
38 | #include <sound/driver.h> | ||
39 | #include <linux/init.h> | 38 | #include <linux/init.h> |
40 | #include <linux/slab.h> | 39 | #include <linux/slab.h> |
41 | #include <sound/core.h> | 40 | #include <sound/core.h> |
diff --git a/sound/core/seq/seq_system.c b/sound/core/seq/seq_system.c index b201b76e9412..77884e62b648 100644 --- a/sound/core/seq/seq_system.c +++ b/sound/core/seq/seq_system.c | |||
@@ -19,7 +19,6 @@ | |||
19 | * | 19 | * |
20 | */ | 20 | */ |
21 | 21 | ||
22 | #include <sound/driver.h> | ||
23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
24 | #include <sound/core.h> | 23 | #include <sound/core.h> |
25 | #include "seq_system.h" | 24 | #include "seq_system.h" |
diff --git a/sound/core/seq/seq_timer.c b/sound/core/seq/seq_timer.c index 82a5b333a963..d8fcd62e400f 100644 --- a/sound/core/seq/seq_timer.c +++ b/sound/core/seq/seq_timer.c | |||
@@ -20,7 +20,6 @@ | |||
20 | * | 20 | * |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <sound/driver.h> | ||
24 | #include <sound/core.h> | 23 | #include <sound/core.h> |
25 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
26 | #include "seq_timer.h" | 25 | #include "seq_timer.h" |
diff --git a/sound/core/seq/seq_virmidi.c b/sound/core/seq/seq_virmidi.c index e11790f6debe..86e7739269ca 100644 --- a/sound/core/seq/seq_virmidi.c +++ b/sound/core/seq/seq_virmidi.c | |||
@@ -35,7 +35,6 @@ | |||
35 | * | 35 | * |
36 | */ | 36 | */ |
37 | 37 | ||
38 | #include <sound/driver.h> | ||
39 | #include <linux/init.h> | 38 | #include <linux/init.h> |
40 | #include <linux/wait.h> | 39 | #include <linux/wait.h> |
41 | #include <linux/slab.h> | 40 | #include <linux/slab.h> |