aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/znet.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-11-18 10:55:32 -0800
committerDavid S. Miller <davem@davemloft.net>2009-11-18 10:55:32 -0800
commitdfef948ed2ba69cf041840b5e860d6b4e16fa0b1 (patch)
treeeab385cabe589346bcf19385c997ab8dabaef7bd /drivers/net/znet.c
parentea31ba359c55e0734ff895692185d4c50cf0c537 (diff)
parentc85e9d7739fc8d879c4293ea020760926d6f87cd (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.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/znet.c b/drivers/net/znet.c
index b4234733375..443c4eee28c 100644
--- a/drivers/net/znet.c
+++ b/drivers/net/znet.c
@@ -103,8 +103,7 @@
#include <asm/io.h>
#include <asm/dma.h>
-/* This include could be elsewhere, since it is not wireless specific */
-#include "wireless/i82593.h"
+#include <linux/i82593.h>
static char version[] __initdata = "znet.c:v1.02 9/23/94 becker@scyld.com\n";