diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 19:38:36 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 19:38:36 -0500 |
| commit | 4da5cc2cec8caec1d357053e85a7a32f243f93a1 (patch) | |
| tree | 3f8b603af4af88f86be7ec1d4e3639a7fc9dd1a6 /include/sound/driver.h | |
| parent | 25c862cc9ea9b312c25a9f577f91b973131f1261 (diff) | |
| parent | c6f43290ae687c11cdcd150d8bfeb57ec29cfa5b (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa
Diffstat (limited to 'include/sound/driver.h')
| -rw-r--r-- | include/sound/driver.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/sound/driver.h b/include/sound/driver.h index 3f0416ac24d9..89c6a73f3920 100644 --- a/include/sound/driver.h +++ b/include/sound/driver.h | |||
| @@ -28,7 +28,12 @@ | |||
| 28 | 28 | ||
| 29 | #include <linux/config.h> | 29 | #include <linux/config.h> |
| 30 | 30 | ||
| 31 | #define SNDRV_CARDS 8 /* number of supported soundcards - don't change - minor numbers */ | 31 | /* number of supported soundcards */ |
| 32 | #ifdef CONFIG_SND_DYNAMIC_MINORS | ||
| 33 | #define SNDRV_CARDS 32 | ||
| 34 | #else | ||
| 35 | #define SNDRV_CARDS 8 /* don't change - minor numbers */ | ||
| 36 | #endif | ||
| 32 | 37 | ||
| 33 | #ifndef CONFIG_SND_MAJOR /* standard configuration */ | 38 | #ifndef CONFIG_SND_MAJOR /* standard configuration */ |
| 34 | #define CONFIG_SND_MAJOR 116 | 39 | #define CONFIG_SND_MAJOR 116 |