[ARM] Merge AT91 and devel branches

[linux.git] / sound / arm / aaci.h

diff --git a/sound/arm/aaci.h b/sound/arm/aaci.h
index 83f73c2505c6ea1145475db867c2fcfeb5570366..06295190606ce0767e069e246457d73032793c32 100644 (file)
--- a/sound/arm/aaci.h
+++ b/sound/arm/aaci.h
@@ -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;