Merge branches 'release' and 'gpe-ack' into release

[linux-2.6] / drivers / net / wireless / prism54 / islpci_eth.c

diff --git a/drivers/net/wireless/prism54/islpci_eth.c b/drivers/net/wireless/prism54/islpci_eth.c
index f49eb068c7d0ce232b9535d6d036bf64ae11222c..762e85bef55dcef657ded932a53f911b051ae4b9 100644 (file)
--- a/drivers/net/wireless/prism54/islpci_eth.c
+++ b/drivers/net/wireless/prism54/islpci_eth.c
@@ -471,7 +471,7 @@ islpci_eth_receive(islpci_private *priv)
                wmb();
 
                /* increment the driver read pointer */
-               add_le32p((u32 *) &control_block->
+               add_le32p(&control_block->
                          driver_curr_frag[ISL38XX_CB_RX_DATA_LQ], 1);
        }