diff -urpN -X /home/fletch/.diff.exclude 102-poll_tlan/drivers/net/tulip/tulip_core.c 103-poll_tulip/drivers/net/tulip/tulip_core.c
--- 102-poll_tlan/drivers/net/tulip/tulip_core.c	Mon Dec  8 09:55:52 2003
+++ 103-poll_tulip/drivers/net/tulip/tulip_core.c	Wed Dec 24 18:24:39 2003
@@ -247,6 +247,9 @@ static void tulip_down(struct net_device
 static struct net_device_stats *tulip_get_stats(struct net_device *dev);
 static int private_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
 static void set_rx_mode(struct net_device *dev);
+#ifdef CONFIG_NET_POLL_CONTROLLER
+static void poll_tulip(struct net_device *dev);
+#endif
 
 
 
@@ -1633,6 +1636,9 @@ static int __devinit tulip_init_one (str
 	dev->get_stats = tulip_get_stats;
 	dev->do_ioctl = private_ioctl;
 	dev->set_multicast_list = set_rx_mode;
+#ifdef CONFIG_NET_POLL_CONTROLLER
+	dev->poll_controller = &poll_tulip;
+#endif
 
 	if (register_netdev(dev))
 		goto err_out_free_ring;
@@ -1788,6 +1794,24 @@ static void __devexit tulip_remove_one (
 
 	/* pci_power_off (pdev, -1); */
 }
+
+
+#ifdef CONFIG_NET_POLL_CONTROLLER
+
+/*
+ * Polling 'interrupt' - used by things like netconsole to send skbs
+ * without having to re-enable interrupts. It's not called while
+ * the interrupt routine is executing.
+ */
+
+static void poll_tulip (struct net_device *dev)
+{
+       disable_irq(dev->irq);
+       tulip_interrupt (dev->irq, dev, NULL);
+       enable_irq(dev->irq);
+}
+
+#endif
 
 
 static struct pci_driver tulip_driver = {