Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[mv-sheeva.git] / drivers / net / 3c501.h

diff --git a/drivers/net/3c501.h b/drivers/net/3c501.h
index adb0588a4d79368bad7bc1ca7663f9cd8511a72e..c56a2c62f7deaf094cf1b7e65dcb6bb8ee719bf8 100644 (file)
--- a/drivers/net/3c501.h
+++ b/drivers/net/3c501.h
@@ -7,13 +7,13 @@ static int  el1_probe1(struct net_device *dev, int ioaddr);
 static int  el_open(struct net_device *dev);
 static void el_timeout(struct net_device *dev);
 static int  el_start_xmit(struct sk_buff *skb, struct net_device *dev);
-static irqreturn_t el_interrupt(int irq, void *dev_id, struct pt_regs *regs);
+static irqreturn_t el_interrupt(int irq, void *dev_id);
 static void el_receive(struct net_device *dev);
 static void el_reset(struct net_device *dev);
 static int  el1_close(struct net_device *dev);
 static struct net_device_stats *el1_get_stats(struct net_device *dev);
 static void set_multicast_list(struct net_device *dev);
-static struct ethtool_ops netdev_ethtool_ops;
+static const struct ethtool_ops netdev_ethtool_ops;
 
 #define EL1_IO_EXTENT  16
 
@@ -37,7 +37,7 @@ struct net_local
        spinlock_t      lock;           /* Serializing lock */
 };
 
-\f
+
 #define RX_STATUS (ioaddr + 0x06)
 #define RX_CMD   RX_STATUS
 #define TX_STATUS (ioaddr + 0x07)