summaryrefslogtreecommitdiff
path: root/drivers/net/tulip
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2006-02-09 22:17:05 +0300
committerJeff Garzik <jgarzik@pobox.com>2006-02-09 22:17:05 +0300
commit70c07e02625ec46d0ffbfce1acef42d660803528 (patch)
treef500f1a4f93e72747fb08b0eefabb167dcdc5db9 /drivers/net/tulip
parent5d1769ac3d0ea5ff3a286b097c21faaf6a9e6859 (diff)
parent2746b8623abce815aaae7afc946b1b39f8436f5a (diff)
downloadlinux-70c07e02625ec46d0ffbfce1acef42d660803528.tar.xz
Merge branch 'viro'
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 c5c738a51ee3..56344103ac23 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__)