patch-2.3.14 linux/drivers/net/jazzsonic.c

Next file: linux/drivers/net/lance.c
Previous file: linux/drivers/net/irda/w83977af_ir.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.13/linux/drivers/net/jazzsonic.c linux/drivers/net/jazzsonic.c
@@ -82,15 +82,15 @@
 
 /* Index to functions, as function prototypes. */
 
-extern int sonic_probe(struct device *dev);
-static int sonic_probe1(struct device *dev, unsigned int base_addr, unsigned int irq);
+extern int sonic_probe(struct net_device *dev);
+static int sonic_probe1(struct net_device *dev, unsigned int base_addr, unsigned int irq);
 
 
 /*
  * Probe for a SONIC ethernet controller on a Mips Jazz board.
  * Actually probing is superfluous but we're paranoid.
  */
-__initfunc(int sonic_probe(struct device *dev))
+__initfunc(int sonic_probe(struct net_device *dev))
 {
     unsigned int base_addr = dev ? dev->base_addr : 0;
     int i;
@@ -115,7 +115,7 @@
     return -ENODEV;
 }
 
-__initfunc(static int sonic_probe1(struct device *dev,
+__initfunc(static int sonic_probe1(struct net_device *dev,
                                    unsigned int base_addr, unsigned int irq))
 {
     static unsigned version_printed = 0;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)