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/wan | |
| 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/wan')
| -rw-r--r-- | drivers/net/wan/hostess_sv11.c | 1 | ||||
| -rw-r--r-- | drivers/net/wan/sealevel.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wan/hostess_sv11.c b/drivers/net/wan/hostess_sv11.c index 7db1d1d0bb34..cf5c805452a3 100644 --- a/drivers/net/wan/hostess_sv11.c +++ b/drivers/net/wan/hostess_sv11.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/ioport.h> | 29 | #include <linux/ioport.h> |
| 30 | #include <net/arp.h> | 30 | #include <net/arp.h> |
| 31 | 31 | ||
| 32 | #include <asm/irq.h> | ||
| 32 | #include <asm/io.h> | 33 | #include <asm/io.h> |
| 33 | #include <asm/dma.h> | 34 | #include <asm/dma.h> |
| 34 | #include <asm/byteorder.h> | 35 | #include <asm/byteorder.h> |
diff --git a/drivers/net/wan/sealevel.c b/drivers/net/wan/sealevel.c index 5380ddfcd7d5..050e854e7774 100644 --- a/drivers/net/wan/sealevel.c +++ b/drivers/net/wan/sealevel.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 24 | #include <net/arp.h> | 24 | #include <net/arp.h> |
| 25 | 25 | ||
| 26 | #include <asm/irq.h> | ||
| 26 | #include <asm/io.h> | 27 | #include <asm/io.h> |
| 27 | #include <asm/dma.h> | 28 | #include <asm/dma.h> |
| 28 | #include <asm/byteorder.h> | 29 | #include <asm/byteorder.h> |