Merge firewire branches to be released post v2.6.35

[mv-sheeva.git] / drivers / firewire / net.c

diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c
index 7142eeec8074374d87109ec98d65f78d28bd0e74..da17d409a244b0af97249341855dfe301b506ab3 100644 (file)
--- a/drivers/firewire/net.c
+++ b/drivers/firewire/net.c
@@ -806,8 +806,8 @@ static int fwnet_incoming_packet(struct fwnet_device *dev, __be32 *buf, int len,
 
 static void fwnet_receive_packet(struct fw_card *card, struct fw_request *r,
                int tcode, int destination, int source, int generation,
-               int speed, unsigned long long offset, void *payload,
-               size_t length, void *callback_data)
+               unsigned long long offset, void *payload, size_t length,
+               void *callback_data)
 {
        struct fwnet_device *dev = callback_data;
        int rcode;