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 /include/sound | |
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 'include/sound')
-rw-r--r-- | include/sound/core.h | 10 | ||||
-rw-r--r-- | include/sound/driver.h | 48 | ||||
-rw-r--r-- | include/sound/opl3.h | 19 | ||||
-rw-r--r-- | include/sound/soc.h | 1 |
4 files changed, 19 insertions, 59 deletions
diff --git a/include/sound/core.h b/include/sound/core.h index 6954836487ed..4fc0235ad784 100644 --- a/include/sound/core.h +++ b/include/sound/core.h | |||
@@ -22,12 +22,22 @@ | |||
22 | * | 22 | * |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <linux/module.h> | ||
25 | #include <linux/sched.h> /* wake_up() */ | 26 | #include <linux/sched.h> /* wake_up() */ |
26 | #include <linux/mutex.h> /* struct mutex */ | 27 | #include <linux/mutex.h> /* struct mutex */ |
27 | #include <linux/rwsem.h> /* struct rw_semaphore */ | 28 | #include <linux/rwsem.h> /* struct rw_semaphore */ |
28 | #include <linux/pm.h> /* pm_message_t */ | 29 | #include <linux/pm.h> /* pm_message_t */ |
29 | #include <linux/device.h> | 30 | #include <linux/device.h> |
30 | 31 | ||
32 | /* number of supported soundcards */ | ||
33 | #ifdef CONFIG_SND_DYNAMIC_MINORS | ||
34 | #define SNDRV_CARDS 32 | ||
35 | #else | ||
36 | #define SNDRV_CARDS 8 /* don't change - minor numbers */ | ||
37 | #endif | ||
38 | |||
39 | #define CONFIG_SND_MAJOR 116 /* standard configuration */ | ||
40 | |||
31 | /* forward declarations */ | 41 | /* forward declarations */ |
32 | #ifdef CONFIG_PCI | 42 | #ifdef CONFIG_PCI |
33 | struct pci_dev; | 43 | struct pci_dev; |
diff --git a/include/sound/driver.h b/include/sound/driver.h index 1889929d1831..f0359437d01a 100644 --- a/include/sound/driver.h +++ b/include/sound/driver.h | |||
@@ -1,47 +1 @@ | |||
1 | #ifndef __SOUND_DRIVER_H | #warning "This file is deprecated" | |
2 | #define __SOUND_DRIVER_H | ||
3 | |||
4 | /* | ||
5 | * Main header file for the ALSA driver | ||
6 | * Copyright (c) 1994-2000 by Jaroslav Kysela <perex@perex.cz> | ||
7 | * | ||
8 | * | ||
9 | * This program is free software; you can redistribute it and/or modify | ||
10 | * it under the terms of the GNU General Public License as published by | ||
11 | * the Free Software Foundation; either version 2 of the License, or | ||
12 | * (at your option) any later version. | ||
13 | * | ||
14 | * This program is distributed in the hope that it will be useful, | ||
15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
17 | * GNU General Public License for more details. | ||
18 | * | ||
19 | * You should have received a copy of the GNU General Public License | ||
20 | * along with this program; if not, write to the Free Software | ||
21 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
22 | * | ||
23 | */ | ||
24 | |||
25 | #ifdef ALSA_BUILD | ||
26 | #include "config.h" | ||
27 | #endif | ||
28 | |||
29 | |||
30 | /* number of supported soundcards */ | ||
31 | #ifdef CONFIG_SND_DYNAMIC_MINORS | ||
32 | #define SNDRV_CARDS 32 | ||
33 | #else | ||
34 | #define SNDRV_CARDS 8 /* don't change - minor numbers */ | ||
35 | #endif | ||
36 | |||
37 | #ifndef CONFIG_SND_MAJOR /* standard configuration */ | ||
38 | #define CONFIG_SND_MAJOR 116 | ||
39 | #endif | ||
40 | |||
41 | #ifdef ALSA_BUILD | ||
42 | #include "adriver.h" | ||
43 | #endif | ||
44 | |||
45 | #include <linux/module.h> | ||
46 | |||
47 | #endif /* __SOUND_DRIVER_H */ | ||
diff --git a/include/sound/opl3.h b/include/sound/opl3.h index d7e33ce09120..a0c5febdc4ea 100644 --- a/include/sound/opl3.h +++ b/include/sound/opl3.h | |||
@@ -51,19 +51,16 @@ | |||
51 | * | 51 | * |
52 | */ | 52 | */ |
53 | 53 | ||
54 | #include "driver.h" | 54 | #include <sound/core.h> |
55 | #include <linux/time.h> | 55 | #include <sound/hwdep.h> |
56 | #include <linux/mutex.h> | 56 | #include <sound/timer.h> |
57 | #include "core.h" | 57 | #include <sound/seq_midi_emul.h> |
58 | #include "hwdep.h" | ||
59 | #include "timer.h" | ||
60 | #include "seq_midi_emul.h" | ||
61 | #ifdef CONFIG_SND_SEQUENCER_OSS | 58 | #ifdef CONFIG_SND_SEQUENCER_OSS |
62 | #include "seq_oss.h" | 59 | #include <sound/seq_oss.h> |
63 | #include "seq_oss_legacy.h" | 60 | #include <sound/seq_oss_legacy.h> |
64 | #endif | 61 | #endif |
65 | #include "seq_device.h" | 62 | #include <sound/seq_device.h> |
66 | #include "asound_fm.h" | 63 | #include <sound/asound_fm.h> |
67 | 64 | ||
68 | /* | 65 | /* |
69 | * Register numbers for the global registers | 66 | * Register numbers for the global registers |
diff --git a/include/sound/soc.h b/include/sound/soc.h index f47ef1f75f18..c22c65650405 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h | |||
@@ -16,7 +16,6 @@ | |||
16 | #include <linux/platform_device.h> | 16 | #include <linux/platform_device.h> |
17 | #include <linux/types.h> | 17 | #include <linux/types.h> |
18 | #include <linux/workqueue.h> | 18 | #include <linux/workqueue.h> |
19 | #include <sound/driver.h> | ||
20 | #include <sound/core.h> | 19 | #include <sound/core.h> |
21 | #include <sound/pcm.h> | 20 | #include <sound/pcm.h> |
22 | #include <sound/control.h> | 21 | #include <sound/control.h> |