diff options
author | John W. Linville <linville@tuxdriver.com> | 2009-11-17 10:16:32 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-11-17 10:16:32 -0500 |
commit | c85e9d7739fc8d879c4293ea020760926d6f87cd (patch) | |
tree | b896cf651a17aa7328d41803ba34a412de62f16e | |
parent | b23709248fc9b6d5877f9c741d639a160ed21ff6 (diff) |
znet: fix build failure from i82593.h relocation
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.c | 3 | ||||
-rw-r--r-- | drivers/staging/wavelan/wavelan_cs.p.h | 2 | ||||
-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 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 | ||
diff --git a/drivers/staging/wavelan/wavelan_cs.p.h b/drivers/staging/wavelan/wavelan_cs.p.h index 81d91531c4f9..8fbfaa8a5a67 100644 --- a/drivers/staging/wavelan/wavelan_cs.p.h +++ b/drivers/staging/wavelan/wavelan_cs.p.h | |||
@@ -446,7 +446,7 @@ | |||
446 | #include <pcmcia/ds.h> | 446 | #include <pcmcia/ds.h> |
447 | 447 | ||
448 | /* Wavelan declarations */ | 448 | /* Wavelan declarations */ |
449 | #include "i82593.h" /* Definitions for the Intel chip */ | 449 | #include <linux/i82593.h> /* Definitions for the Intel chip */ |
450 | 450 | ||
451 | #include "wavelan_cs.h" /* Others bits of the hardware */ | 451 | #include "wavelan_cs.h" /* Others bits of the hardware */ |
452 | 452 | ||
diff --git a/drivers/staging/wavelan/i82593.h b/include/linux/i82593.h index afac5c7a323d..afac5c7a323d 100644 --- a/drivers/staging/wavelan/i82593.h +++ b/include/linux/i82593.h | |||