From 9004acc70e8c49c50c4c7b652f906f1e0ed5709d Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 8 Jan 2008 18:13:27 +0100 Subject: [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 Signed-off-by: Jaroslav Kysela --- sound/core/control.c | 1 - sound/core/device.c | 1 - sound/core/hwdep.c | 1 - sound/core/info.c | 1 - sound/core/info_oss.c | 1 - sound/core/init.c | 1 - sound/core/isadma.c | 1 - sound/core/memory.c | 2 +- sound/core/misc.c | 1 - sound/core/oss/copy.c | 1 - sound/core/oss/io.c | 1 - sound/core/oss/linear.c | 1 - sound/core/oss/mixer_oss.c | 1 - sound/core/oss/mulaw.c | 1 - sound/core/oss/pcm_oss.c | 1 - sound/core/oss/pcm_plugin.c | 1 - sound/core/oss/rate.c | 1 - sound/core/oss/route.c | 1 - sound/core/pcm.c | 1 - sound/core/pcm_lib.c | 1 - sound/core/pcm_memory.c | 1 - sound/core/pcm_misc.c | 1 - sound/core/pcm_native.c | 1 - sound/core/pcm_timer.c | 1 - sound/core/rawmidi.c | 1 - sound/core/rtctimer.c | 1 - sound/core/seq/oss/seq_oss.c | 1 - sound/core/seq/oss/seq_oss_device.h | 1 - sound/core/seq/seq.c | 1 - sound/core/seq/seq_clientmgr.c | 1 - sound/core/seq/seq_device.c | 1 - sound/core/seq/seq_dummy.c | 1 - sound/core/seq/seq_fifo.c | 1 - sound/core/seq/seq_info.c | 1 - sound/core/seq/seq_lock.c | 1 - sound/core/seq/seq_memory.c | 1 - sound/core/seq/seq_midi.c | 1 - sound/core/seq/seq_midi_emul.c | 1 - sound/core/seq/seq_midi_event.c | 1 - sound/core/seq/seq_ports.c | 1 - sound/core/seq/seq_prioq.c | 1 - sound/core/seq/seq_queue.c | 1 - sound/core/seq/seq_system.c | 1 - sound/core/seq/seq_timer.c | 1 - sound/core/seq/seq_virmidi.c | 1 - sound/core/sound.c | 1 - sound/core/sound_oss.c | 2 -- sound/core/timer.c | 1 - 48 files changed, 1 insertion(+), 49 deletions(-) (limited to 'sound/core') diff --git a/sound/core/control.c b/sound/core/control.c index c89ca0d1f3ce..01a1a5af47bb 100644 --- a/sound/core/control.c +++ b/sound/core/control.c @@ -19,7 +19,6 @@ * */ -#include #include #include #include diff --git a/sound/core/device.c b/sound/core/device.c index ea1a0621eefb..202dac0e4d89 100644 --- a/sound/core/device.c +++ b/sound/core/device.c @@ -19,7 +19,6 @@ * */ -#include #include #include #include diff --git a/sound/core/hwdep.c b/sound/core/hwdep.c index bfd9d182b8a3..6d6589f93899 100644 --- a/sound/core/hwdep.c +++ b/sound/core/hwdep.c @@ -19,7 +19,6 @@ * */ -#include #include #include #include diff --git a/sound/core/info.c b/sound/core/info.c index 1ffd29bb4cd0..9977ec2eace3 100644 --- a/sound/core/info.c +++ b/sound/core/info.c @@ -19,7 +19,6 @@ * */ -#include #include #include #include diff --git a/sound/core/info_oss.c b/sound/core/info_oss.c index 9e8b8163bdd4..e35789a92752 100644 --- a/sound/core/info_oss.c +++ b/sound/core/info_oss.c @@ -19,7 +19,6 @@ * */ -#include #include #include #include diff --git a/sound/core/init.c b/sound/core/init.c index 48d38a79cbbb..dc06e79ca09f 100644 --- a/sound/core/init.c +++ b/sound/core/init.c @@ -19,7 +19,6 @@ * */ -#include #include #include #include diff --git a/sound/core/isadma.c b/sound/core/isadma.c index eb173cef4f05..79f0f16af339 100644 --- a/sound/core/isadma.c +++ b/sound/core/isadma.c @@ -26,7 +26,6 @@ #undef HAVE_REALLY_SLOW_DMA_CONTROLLER -#include #include #include diff --git a/sound/core/memory.c b/sound/core/memory.c index 25b0f056563e..1161158582a6 100644 --- a/sound/core/memory.c +++ b/sound/core/memory.c @@ -20,9 +20,9 @@ * */ -#include #include #include +#include /** * copy_to_user_fromio - copy data from mmio-space to user-space diff --git a/sound/core/misc.c b/sound/core/misc.c index 6cabab8cc537..102d1c36cf26 100644 --- a/sound/core/misc.c +++ b/sound/core/misc.c @@ -19,7 +19,6 @@ * */ -#include #include #include #include diff --git a/sound/core/oss/copy.c b/sound/core/oss/copy.c index d6a04c2d5a75..9ded30d0e97d 100644 --- a/sound/core/oss/copy.c +++ b/sound/core/oss/copy.c @@ -19,7 +19,6 @@ * */ -#include #include #include #include diff --git a/sound/core/oss/io.c b/sound/core/oss/io.c index 3ece39fc48db..f874f6ca3657 100644 --- a/sound/core/oss/io.c +++ b/sound/core/oss/io.c @@ -19,7 +19,6 @@ * */ -#include #include #include #include diff --git a/sound/core/oss/linear.c b/sound/core/oss/linear.c index 06f96a3e86f6..da3dbd41669e 100644 --- a/sound/core/oss/linear.c +++ b/sound/core/oss/linear.c @@ -20,7 +20,6 @@ * */ -#include #include #include #include diff --git a/sound/core/oss/mixer_oss.c b/sound/core/oss/mixer_oss.c index c5a5ab9cae8c..75daed298a15 100644 --- a/sound/core/oss/mixer_oss.c +++ b/sound/core/oss/mixer_oss.c @@ -19,7 +19,6 @@ * */ -#include #include #include #include diff --git a/sound/core/oss/mulaw.c b/sound/core/oss/mulaw.c index 848db82529ed..77f96194a0ed 100644 --- a/sound/core/oss/mulaw.c +++ b/sound/core/oss/mulaw.c @@ -21,7 +21,6 @@ * */ -#include #include #include #include diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c index f7f15e399842..092c2d84a9bc 100644 --- a/sound/core/oss/pcm_oss.c +++ b/sound/core/oss/pcm_oss.c @@ -26,7 +26,6 @@ #define OSS_DEBUG #endif -#include #include #include #include diff --git a/sound/core/oss/pcm_plugin.c b/sound/core/oss/pcm_plugin.c index 14095a927a1b..bec94138205e 100644 --- a/sound/core/oss/pcm_plugin.c +++ b/sound/core/oss/pcm_plugin.c @@ -24,7 +24,6 @@ #define PLUGIN_DEBUG #endif -#include #include #include #include diff --git a/sound/core/oss/rate.c b/sound/core/oss/rate.c index 9eb267913c38..14dfb3175d84 100644 --- a/sound/core/oss/rate.c +++ b/sound/core/oss/rate.c @@ -19,7 +19,6 @@ * */ -#include #include #include #include diff --git a/sound/core/oss/route.c b/sound/core/oss/route.c index de3ffdeaf7e3..da7ab7a3e82c 100644 --- a/sound/core/oss/route.c +++ b/sound/core/oss/route.c @@ -19,7 +19,6 @@ * */ -#include #include #include #include diff --git a/sound/core/pcm.c b/sound/core/pcm.c index cf3af39c3514..1502acd81a18 100644 --- a/sound/core/pcm.c +++ b/sound/core/pcm.c @@ -19,7 +19,6 @@ * */ -#include #include #include #include diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index f00758c2bded..ed0223ca5c55 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -20,7 +20,6 @@ * */ -#include #include #include #include diff --git a/sound/core/pcm_memory.c b/sound/core/pcm_memory.c index a13e38cfd2c6..ff07b4a9992e 100644 --- a/sound/core/pcm_memory.c +++ b/sound/core/pcm_memory.c @@ -19,7 +19,6 @@ * */ -#include #include #include #include diff --git a/sound/core/pcm_misc.c b/sound/core/pcm_misc.c index b9ae6b37a61f..89b7f549bebd 100644 --- a/sound/core/pcm_misc.c +++ b/sound/core/pcm_misc.c @@ -19,7 +19,6 @@ * */ -#include #include #include #include diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index d6b4e6b6108f..e6e4aa87e57e 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -19,7 +19,6 @@ * */ -#include #include #include #include diff --git a/sound/core/pcm_timer.c b/sound/core/pcm_timer.c index 23aa9a27e215..033a024d153a 100644 --- a/sound/core/pcm_timer.c +++ b/sound/core/pcm_timer.c @@ -19,7 +19,6 @@ * */ -#include #include #include #include diff --git a/sound/core/rawmidi.c b/sound/core/rawmidi.c index b8e700b94e59..f94694cb47f8 100644 --- a/sound/core/rawmidi.c +++ b/sound/core/rawmidi.c @@ -19,7 +19,6 @@ * */ -#include #include #include #include diff --git a/sound/core/rtctimer.c b/sound/core/rtctimer.c index 7cd5e8f5d4ce..97b30fb4c361 100644 --- a/sound/core/rtctimer.c +++ b/sound/core/rtctimer.c @@ -20,7 +20,6 @@ * */ -#include #include #include #include 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 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include #include #include #include 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 @@ #ifndef __SEQ_OSS_DEVICE_H #define __SEQ_OSS_DEVICE_H -#include #include #include #include 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 @@ * */ -#include #include #include #include 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 @@ * */ -#include #include #include #include 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 @@ * */ -#include #include #include #include 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 @@ * */ -#include #include #include #include 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 @@ * */ -#include #include #include #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 @@ * */ -#include #include #include 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 @@ * */ -#include #include #include "seq_lock.h" 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 @@ * */ -#include #include #include #include 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: */ -#include #include #include #include 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 @@ * code in here. If there is it should be reported as a bug. */ -#include #include #include #include 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 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include #include #include #include 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 @@ * */ -#include #include #include #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 @@ * */ -#include #include #include #include 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 @@ * - Addition of experimental sync support. */ -#include #include #include #include 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 @@ * */ -#include #include #include #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 @@ * */ -#include #include #include #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 @@ * */ -#include #include #include #include diff --git a/sound/core/sound.c b/sound/core/sound.c index 7b486c4d70db..00cca4d6e562 100644 --- a/sound/core/sound.c +++ b/sound/core/sound.c @@ -19,7 +19,6 @@ * */ -#include #include #include #include diff --git a/sound/core/sound_oss.c b/sound/core/sound_oss.c index dc73313b733a..7be51546eb9e 100644 --- a/sound/core/sound_oss.c +++ b/sound/core/sound_oss.c @@ -19,8 +19,6 @@ * */ -#include - #ifdef CONFIG_SND_OSSEMUL #if !defined(CONFIG_SOUND) && !(defined(MODULE) && defined(CONFIG_SOUND_MODULE)) diff --git a/sound/core/timer.c b/sound/core/timer.c index 7e5fe2d91662..aece465934b8 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c @@ -19,7 +19,6 @@ * */ -#include #include #include #include -- cgit