diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 14:15:02 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 14:15:02 -0500 |
| commit | 2746b8623abce815aaae7afc946b1b39f8436f5a (patch) | |
| tree | 9e14ce2a3710da5c079c1a96efa5e7c8674cd382 /drivers/net/tulip | |
| parent | 0bdd340c092b0936f78a54bdbd3927463ed4fca3 (diff) | |
| parent | 450d86dff3fc4780fd5c2d1654402ab7ffec9c38 (diff) | |
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.c | 3 |
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 @@ | |||
| 32 | 32 | ||
| 33 | #include <asm/uaccess.h> | 33 | #include <asm/uaccess.h> |
| 34 | #include <asm/io.h> | 34 | #include <asm/io.h> |
| 35 | #ifdef CONFIG_NET_POLL_CONTROLLER | ||
| 36 | #include <asm/irq.h> | ||
| 37 | #endif | ||
| 35 | 38 | ||
| 36 | #ifdef DEBUG | 39 | #ifdef DEBUG |
| 37 | #define enter(x) printk("Enter: %s, %s line %i\n",x,__FILE__,__LINE__) | 40 | #define enter(x) printk("Enter: %s, %s line %i\n",x,__FILE__,__LINE__) |