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 4dcae63f8cff969756cad96fec5d436d349e069d..7424b0493f9d09344468ef1c43d6f3cad13ce824 100644 (file)
--- a/drivers/media/dvb/firewire/firedtv-fw.c
+++ b/drivers/media/dvb/firewire/firedtv-fw.c
@@ -41,7 +41,7 @@ static int node_req(struct firedtv *fdtv, u64 addr, void *data, size_t len,
        return rcode != RCODE_COMPLETE ? -EIO : 0;
 }
 
-static int node_lock(struct firedtv *fdtv, u64 addr, __be32 data[])
+static int node_lock(struct firedtv *fdtv, u64 addr, void *data)
 {
        return node_req(fdtv, addr, data, 8, TCODE_LOCK_COMPARE_SWAP);
 }