Merge firewire branches to be released post v2.6.35

[net-next-2.6.git] / drivers / media / dvb / firewire / firedtv-fw.c

diff --git a/drivers/media/dvb/firewire/firedtv-fw.c b/drivers/media/dvb/firewire/firedtv-fw.c
index 75afe4f81e333b4bdeb8f036d4ec317da09e0e00..7424b0493f9d09344468ef1c43d6f3cad13ce824 100644 (file)
--- a/drivers/media/dvb/firewire/firedtv-fw.c
+++ b/drivers/media/dvb/firewire/firedtv-fw.c
@@ -194,8 +194,8 @@ static const struct firedtv_backend backend = {
 
 static void handle_fcp(struct fw_card *card, struct fw_request *request,
                       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 firedtv *f, *fdtv = NULL;
        struct fw_device *device;