X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fsound%2Fcore.h;h=5135147f20e89db0413eff0c1ee99dea305af0be;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=bab3ff457e40cfa00e21b40f2d9e14fee12f8e07;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/include/sound/core.h b/include/sound/core.h
index bab3ff457..5135147f2 100644
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -188,6 +188,8 @@ struct snd_minor {
 	int device;			/* device number */
 	const struct file_operations *f_ops;	/* file operations */
 	void *private_data;		/* private data for f_ops->open */
+	char name[0];			/* device name (keep at the end of
+								structure) */
 };
 
 /* sound.c */
@@ -231,8 +233,9 @@ int copy_from_user_toio(volatile void __iomem *dst, const void __user *src, size
 
 /* init.c */
 
+extern unsigned int snd_cards_lock;
 extern struct snd_card *snd_cards[SNDRV_CARDS];
-int snd_card_locked(int card);
+extern rwlock_t snd_card_rwlock;
 #if defined(CONFIG_SND_MIXER_OSS) || defined(CONFIG_SND_MIXER_OSS_MODULE)
 #define SND_MIXER_OSS_NOTIFY_REGISTER	0
 #define SND_MIXER_OSS_NOTIFY_DISCONNECT	1