Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[karo-tx-linux.git] / include / sound / driver.h

diff --git a/include/sound/driver.h b/include/sound/driver.h
index 3f0416ac24d95fe9d711165451028e7e85a38747..3c522e59a33cf041f75d3fbf82e1ca7ccd6f31af 100644 (file)
--- a/include/sound/driver.h
+++ b/include/sound/driver.h
@@ -26,9 +26,13 @@
 #include "config.h"
 #endif
 
-#include <linux/config.h>
 
-#define SNDRV_CARDS            8       /* number of supported soundcards - don't change - minor numbers */
+/* number of supported soundcards */
+#ifdef CONFIG_SND_DYNAMIC_MINORS
+#define SNDRV_CARDS 32
+#else
+#define SNDRV_CARDS 8          /* don't change - minor numbers */
+#endif
 
 #ifndef CONFIG_SND_MAJOR       /* standard configuration */
 #define CONFIG_SND_MAJOR       116