Pull sony into release branch

[linux-2.6-omap-h63xx.git] / sound / arm / aaci.h

diff --git a/sound/arm/aaci.h b/sound/arm/aaci.h
index 83f73c2505c6ea1145475db867c2fcfeb5570366..9175ff9ded0165500514d630edd4e1603ad34d16 100644 (file)
--- a/sound/arm/aaci.h
+++ b/sound/arm/aaci.h
@@ -227,8 +227,8 @@ struct aaci {
        unsigned int            fifosize;
 
        /* AC'97 */
-       struct semaphore        ac97_sem;
-       ac97_bus_t              *ac97_bus;
+       struct mutex            ac97_sem;
+       struct snd_ac97_bus     *ac97_bus;
 
        u32                     maincr;
        spinlock_t              lock;