Patched in Tegra support.

1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/net/cris/eth_v10.c b/drivers/net/cris/eth_v10.c
index 021d69c5d9b..e66aceb57ce 100644
--- a/drivers/net/cris/eth_v10.c
+++ b/drivers/net/cris/eth_v10.c
@@ -35,6 +35,7 @@
 #include <asm/io.h>         /* CRIS_LED_* I/O functions */
 #include <asm/irq.h>
 #include <asm/dma.h>
+#include <asm/system.h>
 #include <asm/ethernet.h>
 #include <asm/cache.h>
 #include <arch/io_interface_mux.h>
@@ -260,7 +261,7 @@ static const struct net_device_ops e100_netdev_ops = {
         .ndo_start_xmit         = e100_send_packet,
         .ndo_tx_timeout         = e100_tx_timeout,
         .ndo_get_stats          = e100_get_stats,
-        .ndo_set_rx_mode        = set_multicast_list,
+        .ndo_set_multicast_list = set_multicast_list,
         .ndo_do_ioctl           = e100_ioctl,
         .ndo_set_mac_address    = e100_set_mac_address,
         .ndo_validate_addr      = eth_validate_addr,
@@ -1008,7 +1009,7 @@ e100_send_mdio_bit(unsigned char bit)
 }
 
 static unsigned char
-e100_receive_mdio_bit(void)
+e100_receive_mdio_bit()
 {
         unsigned char bit;
         *R_NETWORK_MGM_CTRL = 0;
@@ -1131,6 +1132,7 @@ static irqreturn_t
 e100rxtx_interrupt(int irq, void *dev_id)
 {
         struct net_device *dev = (struct net_device *)dev_id;
+        struct net_local *np = netdev_priv(dev);
         unsigned long irqbits;
 
         /*
@@ -1712,7 +1714,7 @@ e100_set_network_leds(int active)
 static void
 e100_netpoll(struct net_device* netdev)
 {
-        e100rxtx_interrupt(NETWORK_DMA_TX_IRQ_NBR, netdev);
+        e100rxtx_interrupt(NETWORK_DMA_TX_IRQ_NBR, netdev, NULL);
 }
 #endif