From 9f52fadc217035e3ae3d6efeacba10df444ef520 Mon Sep 17 00:00:00 2001 From: "John W. Linville" Date: Tue, 17 Nov 2009 10:16:32 -0500 Subject: [PATCH] --- yaml --- r: 171760 b: refs/heads/master c: c85e9d7739fc8d879c4293ea020760926d6f87cd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/znet.c | 3 +-- trunk/drivers/staging/wavelan/wavelan_cs.p.h | 2 +- trunk/{drivers/staging/wavelan => include/linux}/i82593.h | 0 4 files changed, 3 insertions(+), 4 deletions(-) rename trunk/{drivers/staging/wavelan => include/linux}/i82593.h (100%) diff --git a/[refs] b/[refs] index 668a5b6222d0..3022f0824a09 100644 --- 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 index b42347333750..443c4eee28c1 100644 --- a/trunk/drivers/net/znet.c +++ b/trunk/drivers/net/znet.c @@ -103,8 +103,7 @@ #include #include -/* This include could be elsewhere, since it is not wireless specific */ -#include "wireless/i82593.h" +#include 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 index 81d91531c4f9..8fbfaa8a5a67 100644 --- a/trunk/drivers/staging/wavelan/wavelan_cs.p.h +++ b/trunk/drivers/staging/wavelan/wavelan_cs.p.h @@ -446,7 +446,7 @@ #include /* Wavelan declarations */ -#include "i82593.h" /* Definitions for the Intel chip */ +#include /* Definitions for the Intel chip */ #include "wavelan_cs.h" /* Others bits of the hardware */ diff --git a/trunk/drivers/staging/wavelan/i82593.h b/trunk/include/linux/i82593.h similarity index 100% rename from trunk/drivers/staging/wavelan/i82593.h rename to trunk/include/linux/i82593.h