---

yaml --- r: 171760 b: refs/heads/master c: c85e9d7 h: refs/heads/master v: v3
git-mirror · Nov 17, 2009 · 9f52fad · 9f52fad
1 parent dbbb20e
commit 9f52fad
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b23709248fc9b6d5877f9c741d639a160ed21ff6
+refs/heads/master: c85e9d7739fc8d879c4293ea020760926d6f87cd
diff --git a/trunk/drivers/net/znet.c b/trunk/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/trunk/drivers/staging/wavelan/wavelan_cs.p.h b/trunk/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/trunk/drivers/staging/wavelan/i82593.h → trunk/include/linux/i82593.h b/trunk/drivers/staging/wavelan/i82593.h → trunk/include/linux/i82593.h