summaryrefslogtreecommitdiffstats
path: root/drivers/net/tulip
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2006-02-09 14:15:02 -0500
committerJeff Garzik <jgarzik@pobox.com>2006-02-09 14:15:02 -0500
commit2746b8623abce815aaae7afc946b1b39f8436f5a (patch)
tree9e14ce2a3710da5c079c1a96efa5e7c8674cd382 /drivers/net/tulip
parent0bdd340c092b0936f78a54bdbd3927463ed4fca3 (diff)
parent450d86dff3fc4780fd5c2d1654402ab7ffec9c38 (diff)
downloadlinux-2746b8623abce815aaae7afc946b1b39f8436f5a.tar.bz2
Merge branch 'net.b0' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bird
Diffstat (limited to 'drivers/net/tulip')
-rw-r--r--drivers/net/tulip/xircom_cb.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/tulip/xircom_cb.c b/drivers/net/tulip/xircom_cb.c
index 60d1e05ab732..42e9ffb07af4 100644
--- a/drivers/net/tulip/xircom_cb.c
+++ b/drivers/net/tulip/xircom_cb.c
@@ -32,6 +32,9 @@
#include <asm/uaccess.h>
#include <asm/io.h>
+#ifdef CONFIG_NET_POLL_CONTROLLER
+#include <asm/irq.h>
+#endif
#ifdef DEBUG
#define enter(x) printk("Enter: %s, %s line %i\n",x,__FILE__,__LINE__)