Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[sfrench/cifs-2.6.git] / include / sound / ad1848.h

diff --git a/include/sound/ad1848.h b/include/sound/ad1848.h
index 1a2759f3a292b66d9bbc2f21514cd9a92d23e80a..57af1fe7b30998327847ac1cff7c003ac5ef407c 100644 (file)
--- a/include/sound/ad1848.h
+++ b/include/sound/ad1848.h
@@ -154,7 +154,7 @@ struct snd_ad1848 {
 #endif
 
        spinlock_t reg_lock;
-       struct semaphore open_mutex;
+       struct mutex open_mutex;
 };
 
 /* exported functions */