Merge branch 'topic/aoa' into to-push

[safe/jmp/linux-2.6] / sound / aoa / fabrics / layout.c

diff --git a/sound/aoa/fabrics/snd-aoa-fabric-layout.c b/sound/aoa/fabrics/layout.c
similarity index 99%
rename from sound/aoa/fabrics/snd-aoa-fabric-layout.c
rename to sound/aoa/fabrics/layout.c
index dea7abb..ad60f5d 100644 (file)
--- a/sound/aoa/fabrics/snd-aoa-fabric-layout.c
+++ b/sound/aoa/fabrics/layout.c
@@ -66,7 +66,7 @@ struct layout {
        unsigned int layout_id;
        struct codec_connect_info codecs[MAX_CODECS_PER_BUS];
        int flags;
-       
+
        /* if busname is not assigned, we use 'Master' below,
         * so that our layout table doesn't need to be filled
         * too much.