Merge mulgrave-w:git/linux-2.6

Conflicts:

	include/linux/blkdev.h

Trivial merge to incorporate tag prototypes.

1 files changed, 7 insertions, 3 deletions

diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c
index f435fcd6dca9..fe210c853442 100644
--- a/sound/pci/riptide/riptide.c
+++ b/sound/pci/riptide/riptide.c
@@ -673,9 +673,13 @@ static struct lbuspath lbus_rec_path = {
 #define FIRMWARE_VERSIONS 1
 static union firmware_version firmware_versions[] = {
         {
-         .firmware.ASIC = 3,.firmware.CODEC = 2,
-         .firmware.AUXDSP = 3,.firmware.PROG = 773,
-         },
+                .firmware = {
+                        .ASIC = 3,
+                        .CODEC = 2,
+                        .AUXDSP = 3,
+                        .PROG = 773,
+                },
+        },
 };
 
 static u32 atoh(unsigned char *in, unsigned int len)