Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc

[~andy/linux] / sound / firewire / iso-resources.h

diff --git a/sound/firewire/iso-resources.h b/sound/firewire/iso-resources.h
index 9feb9f8d474585306d66cb6fd4c4669ee1f438c1..5a9af7c61657e5429f35a0dd6c844d3af6d069c6 100644 (file)
--- a/sound/firewire/iso-resources.h
+++ b/sound/firewire/iso-resources.h
@@ -24,11 +24,10 @@ struct fw_iso_resources {
        unsigned int bandwidth_overhead;
        int generation; /* in which allocation is valid */
        bool allocated;
-       __be32 buffer[2];
 };
 
-void fw_iso_resources_init(struct fw_iso_resources *r,
-                          struct fw_unit *unit);
+int fw_iso_resources_init(struct fw_iso_resources *r,
+                         struct fw_unit *unit);
 void fw_iso_resources_destroy(struct fw_iso_resources *r);
 
 int fw_iso_resources_allocate(struct fw_iso_resources *r,