From 012bb3e61e5eced6c610f9e036372bf0c8def2d1 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Thu, 5 Oct 2000 01:18:40 +0000 Subject: Merge with Linux 2.4.0-test9. Please check DECstation, I had a number of rejects to fixup while integrating Linus patches. I also found that this kernel will only boot SMP on Origin; the UP kernel freeze soon after bootup with SCSI timeout messages. I commit this anyway since I found that the last CVS versions had the same problem. --- drivers/net/8390.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'drivers/net/8390.h') diff --git a/drivers/net/8390.h b/drivers/net/8390.h index 715c95501..6c8a68ecc 100644 --- a/drivers/net/8390.h +++ b/drivers/net/8390.h @@ -53,11 +53,11 @@ extern unsigned long autoirq_report(int waittime); #if defined(LOAD_8390_BY_KMOD) && defined(MODULE) && !defined(NS8390_CORE) /* Function pointers to be mapped onto the 8390 core support */ -static int (*S_ethdev_init)(struct net_device *dev) = NULL; -static void (*S_NS8390_init)(struct net_device *dev, int startp) = NULL; -static int (*S_ei_open)(struct net_device *dev) = NULL; -static int (*S_ei_close)(struct net_device *dev) = NULL; -static void (*S_ei_interrupt)(int irq, void *dev_id, struct pt_regs *regs) = NULL; +static int (*S_ethdev_init)(struct net_device *dev); +static void (*S_NS8390_init)(struct net_device *dev, int startp); +static int (*S_ei_open)(struct net_device *dev); +static int (*S_ei_close)(struct net_device *dev); +static void (*S_ei_interrupt)(int irq, void *dev_id, struct pt_regs *regs); extern __inline__ void unload_8390_module(void) { -- cgit v1.2.3