Merge branch 'task_killable' of git://git.kernel.org/pub/scm/linux/kernel/git/willy...

[linux-2.6] / include / sound / core.h

diff --git a/include/sound/core.h b/include/sound/core.h
index 3c493ad620d1e518b73c728fac47605fd41a222e..4fc0235ad78433a314f4b2f406a47d8e1c5827fc 100644 (file)
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -3,7 +3,7 @@
 
 /*
  *  Main header file for the ALSA driver
- *  Copyright (c) 1994-2001 by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) 1994-2001 by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -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;
@@ -242,7 +252,7 @@ static inline int snd_register_device(int type, struct snd_card *card, int dev,
 {
        return snd_register_device_for_dev(type, card, dev, f_ops,
                                           private_data, name,
-                                          card ? card->dev : NULL);
+                                          snd_card_get_device_link(card));
 }
 
 int snd_unregister_device(int type, struct snd_card *card, int dev);