Here is the diff between my current and your netdev tree.
--- netdev-2.6/drivers/net/typhoon.c 2004-09-22 14:39:42.000000000 -0700
+++ tcp-2.6/drivers/net/typhoon.c 2004-10-18 12:59:51.000000000 -0700
@@ -99,6 +99,7 @@
#define ERR_PFX KERN_ERR PFX
#include <linux/module.h>
+#include <linux/moduleparam.h>
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/timer.h>
@@ -132,7 +133,7 @@
MODULE_AUTHOR("David Dillow <dave@xxxxxxxxxxxxxx>");
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("3Com Typhoon Family (3C990, 3CR990, and variants)");
-MODULE_PARM(rx_copybreak, "i");
+module_param(rx_copybreak, int, 0);
#if defined(NETIF_F_TSO) && MAX_SKB_FRAGS > 32
#warning Typhoon only supports 32 entries in its SG list for TSO, disabling TSO
@@ -1777,7 +1778,7 @@
typhoon_interrupt(int irq, void *dev_instance, struct pt_regs *rgs)
{
struct net_device *dev = (struct net_device *) dev_instance;
- struct typhoon *tp = dev->priv;
+ struct typhoon *tp = netdev_priv(dev);
void __iomem *ioaddr = tp->ioaddr;
u32 intr_status;
|