Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

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

diff --git a/sound/arm/aaci.h b/sound/arm/aaci.h
index 788c24a..924f69c 100644 (file)
--- a/sound/arm/aaci.h
+++ b/sound/arm/aaci.h
@@ -228,8 +228,8 @@ struct aaci {
 
        /* AC'97 */
        struct mutex            ac97_sem;
-       ac97_bus_t              *ac97_bus;
-       ac97_t                  *ac97;
+       struct snd_ac97_bus     *ac97_bus;
+       struct snd_ac97         *ac97;
 
        u32                     maincr;
        spinlock_t              lock;