summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2009-11-17 10:16:32 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-11-17 10:16:32 -0500
commitc85e9d7739fc8d879c4293ea020760926d6f87cd (patch)
treeb896cf651a17aa7328d41803ba34a412de62f16e
parentb23709248fc9b6d5877f9c741d639a160ed21ff6 (diff)
znet: fix build failure from i82593.h relocationmaster-2009-11-17
znet was including "wireless/i82593.h" (which is a bit wierd), and I missed that when I relocated i82593.h to drivers/staging/wavelan. Since I don't have ISA turned-on in my normal .config, I didn't see the build failures -- mea culpa! Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/znet.c3
-rw-r--r--drivers/staging/wavelan/wavelan_cs.p.h2
-rw-r--r--include/linux/i82593.h (renamed from drivers/staging/wavelan/i82593.h)0
3 files changed, 2 insertions, 3 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";
diff --git a/drivers/staging/wavelan/wavelan_cs.p.h b/drivers/staging/wavelan/wavelan_cs.p.h
index 81d91531c4f..8fbfaa8a5a6 100644
--- a/drivers/staging/wavelan/wavelan_cs.p.h
+++ b/drivers/staging/wavelan/wavelan_cs.p.h
@@ -446,7 +446,7 @@
#include <pcmcia/ds.h>
/* Wavelan declarations */
-#include "i82593.h" /* Definitions for the Intel chip */
+#include <linux/i82593.h> /* Definitions for the Intel chip */
#include "wavelan_cs.h" /* Others bits of the hardware */
diff --git a/drivers/staging/wavelan/i82593.h b/include/linux/i82593.h
index afac5c7a323..afac5c7a323 100644
--- a/drivers/staging/wavelan/i82593.h
+++ b/include/linux/i82593.h