diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-18 13:55:32 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-18 13:55:32 -0500 |
| commit | dfef948ed2ba69cf041840b5e860d6b4e16fa0b1 (patch) | |
| tree | eab385cabe589346bcf19385c997ab8dabaef7bd /drivers/net/znet.c | |
| parent | ea31ba359c55e0734ff895692185d4c50cf0c537 (diff) | |
| parent | c85e9d7739fc8d879c4293ea020760926d6f87cd (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/znet.c')
| -rw-r--r-- | drivers/net/znet.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/znet.c b/drivers/net/znet.c index b42347333750..443c4eee28c1 100644 --- a/drivers/net/znet.c +++ b/drivers/net/znet.c | |||
| @@ -103,8 +103,7 @@ | |||
| 103 | #include <asm/io.h> | 103 | #include <asm/io.h> |
| 104 | #include <asm/dma.h> | 104 | #include <asm/dma.h> |
| 105 | 105 | ||
| 106 | /* This include could be elsewhere, since it is not wireless specific */ | 106 | #include <linux/i82593.h> |
| 107 | #include "wireless/i82593.h" | ||
| 108 | 107 | ||
| 109 | static char version[] __initdata = "znet.c:v1.02 9/23/94 becker@scyld.com\n"; | 108 | static char version[] __initdata = "znet.c:v1.02 9/23/94 becker@scyld.com\n"; |
| 110 | 109 | ||