fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / include / sound / driver.h

diff --git a/include/sound/driver.h b/include/sound/driver.h
index adef8f9..3c522e5 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
@@ -44,23 +48,4 @@
 
 #include <linux/module.h>
 
-/*
- *  ==========================================================================
- */
-
-#ifdef CONFIG_SND_DEBUG_MEMORY
-#include <linux/slab.h>
-#include <linux/vmalloc.h>
-void *snd_wrapper_kmalloc(size_t, int);
-#undef kmalloc
-void snd_wrapper_kfree(const void *);
-#undef kfree
-void *snd_wrapper_vmalloc(size_t);
-#undef vmalloc
-void snd_wrapper_vfree(void *);
-#undef vfree
-#endif
-
-#include "sndmagic.h"
-
 #endif /* __SOUND_DRIVER_H */