Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git] / sound / arm / aaci.h
index 83f73c2..0629519 100644 (file)
@@ -227,7 +227,7 @@ struct aaci {
        unsigned int            fifosize;
 
        /* AC'97 */
-       struct semaphore        ac97_sem;
+       struct mutex            ac97_sem;
        ac97_bus_t              *ac97_bus;
 
        u32                     maincr;