X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Flinux%2Frdc-2.6%2Ffiles%2Fdrivers%2Fnet%2Fr6040.c;h=2398031d5f77899d8e7afbb715d3903d32ddfb54;hb=e651f609f2e46f89b60bfd8b934914762048b5fd;hp=95210d9ce64268202983bf79d26256e499f99d79;hpb=3849ed1013d0efdf7e39bcf6ffff2ed750b8587c;p=openwrt-10.03%2F.git

diff --git a/target/linux/rdc-2.6/files/drivers/net/r6040.c b/target/linux/rdc-2.6/files/drivers/net/r6040.c
index 95210d9ce..2398031d5 100644
--- a/target/linux/rdc-2.6/files/drivers/net/r6040.c
+++ b/target/linux/rdc-2.6/files/drivers/net/r6040.c
@@ -183,12 +183,11 @@ MODULE_PARM_DESC(adr_table, "MAC Address (assigned)");
 
 static int r6040_open(struct net_device *dev);
 static int r6040_start_xmit(struct sk_buff *skb, struct net_device *dev);
-static irqreturn_t r6040_interrupt(int irq, void *dev_id, struct pt_regs *regs);
+static irqreturn_t r6040_interrupt(int irq, void *dev_id);
 static struct net_device_stats *r6040_get_stats(struct net_device *dev);
 static int r6040_close(struct net_device *dev);
 static void set_multicast_list(struct net_device *dev);
 static struct ethtool_ops netdev_ethtool_ops;
-static int netdev_ioctl (struct net_device *dev, struct ifreq *rq, int cmd);
 static void r6040_down(struct net_device *dev);
 static void r6040_up(struct net_device *dev);
 static void r6040_tx_timeout (struct net_device *dev);
@@ -271,7 +270,6 @@ static int __devinit r6040_init_one (struct pci_dev *pdev,
 	dev->stop = &r6040_close;
 	dev->get_stats = &r6040_get_stats;
 	dev->set_multicast_list = &set_multicast_list;
-	dev->do_ioctl = &netdev_ioctl;
 	dev->ethtool_ops = &netdev_ethtool_ops;
 	dev->tx_timeout = &r6040_tx_timeout;
 	dev->watchdog_timeo = TX_TIMEOUT;
@@ -418,7 +416,7 @@ r6040_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
 /* The RDC interrupt handler. */
 static irqreturn_t
-r6040_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+r6040_interrupt(int irq, void *dev_id)
 {
 	struct net_device *dev = dev_id;
 	struct r6040_private *lp;
@@ -608,14 +606,6 @@ r6040_close(struct net_device *dev)
 	return 0;
 }
 
-/**
- */
-static int netdev_ioctl (struct net_device *dev, struct ifreq *rq, int cmd)
-{
-	RDC_DBUG("netdev_ioctl()", 0);
-	return 0;
-}
-
 /**
 	Stop RDC MAC and Free the allocated resource
  */