Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[linux-2.6-omap-h63xx.git] / drivers / net / sunqe.c

diff --git a/drivers/net/sunqe.c b/drivers/net/sunqe.c
index 020e781705958b88c911b1e39df152cc02ef41d6..7874eb1ef04381edade7b85f7eb014705c54d2ed 100644 (file)
--- a/drivers/net/sunqe.c
+++ b/drivers/net/sunqe.c
@@ -468,7 +468,7 @@ static void qe_tx_reclaim(struct sunqe *qep);
  */
 static irqreturn_t qec_interrupt(int irq, void *dev_id)
 {
-       struct sunqec *qecp = (struct sunqec *) dev_id;
+       struct sunqec *qecp = dev_id;
        u32 qec_status;
        int channel = 0;