diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-01-08 18:13:27 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2008-01-31 17:29:48 +0100 |
| commit | 9004acc70e8c49c50c4c7b652f906f1e0ed5709d (patch) | |
| tree | de504d87cc727b4ecab5718522ce94890f349149 /include/sound/core.h | |
| parent | [ALSA] Remove PCM sleep_min and tick (diff) | |
| download | linux-9004acc70e8c49c50c4c7b652f906f1e0ed5709d.tar.xz linux-9004acc70e8c49c50c4c7b652f906f1e0ed5709d.zip | |
[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/core.h')
| -rw-r--r-- | include/sound/core.h | 10 |
1 files changed, 10 insertions, 0 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 @@ * */ +#include <linux/module.h> #include <linux/sched.h> /* wake_up() */ #include <linux/mutex.h> /* struct mutex */ #include <linux/rwsem.h> /* struct rw_semaphore */ #include <linux/pm.h> /* pm_message_t */ #include <linux/device.h> +/* number of supported soundcards */ +#ifdef CONFIG_SND_DYNAMIC_MINORS +#define SNDRV_CARDS 32 +#else +#define SNDRV_CARDS 8 /* don't change - minor numbers */ +#endif + +#define CONFIG_SND_MAJOR 116 /* standard configuration */ + /* forward declarations */ #ifdef CONFIG_PCI struct pci_dev; |