Merge tty-next into 3.6-rc1

[linux-2.6-block.git] / drivers / net / ethernet / sgi / ioc3-eth.c

diff --git a/drivers/net/ethernet/sgi/ioc3-eth.c b/drivers/net/ethernet/sgi/ioc3-eth.c
index fcb5b0e0f260d6a0f1c6b18f8e20ab3ff6aa564f..3e5519a0acc7ebcccb897ed3719b8506a3b585ba 100644 (file)
--- a/drivers/net/ethernet/sgi/ioc3-eth.c
+++ b/drivers/net/ethernet/sgi/ioc3-eth.c
@@ -583,7 +583,7 @@ static inline void ioc3_rx(struct net_device *dev)
        unsigned long *rxr;
        u32 w0, err;
 
-       rxr = (unsigned long *) ip->rxr;                /* Ring base */
+       rxr = ip->rxr;          /* Ring base */
        rx_entry = ip->rx_ci;                           /* RX consume index */
        n_entry = ip->rx_pi;
 
@@ -903,7 +903,7 @@ static void ioc3_alloc_rings(struct net_device *dev)
        if (ip->rxr == NULL) {
                /* Allocate and initialize rx ring.  4kb = 512 entries  */
                ip->rxr = (unsigned long *) get_zeroed_page(GFP_ATOMIC);
-               rxr = (unsigned long *) ip->rxr;
+               rxr = ip->rxr;
                if (!rxr)
                        printk("ioc3_alloc_rings(): get_zeroed_page() failed!\n");