Move headers usbnet.h and rndis_host.h to include/linux/usb and fix includes
for drivers/net/usb modules. Headers are moved because rndis_wlan will be
outside drivers/net/usb in drivers/net/wireless and yet need these headers.
Signed-off-by: Jussi Kivilinna [EMAIL PROTECTED]
---
drivers/net/usb/asix.c |3
drivers/net/usb/cdc_ether.c|3
drivers/net/usb/cdc_subset.c |3
drivers/net/usb/dm9601.c |3
drivers/net/usb/gl620a.c |3
drivers/net/usb/mcs7830.c |3
drivers/net/usb/net1080.c |3
drivers/net/usb/plusb.c|3
drivers/net/usb/rndis_host.c |5 -
drivers/net/usb/rndis_host.h | 274
drivers/net/usb/usbnet.c |3
drivers/net/usb/usbnet.h | 214 ---
drivers/net/usb/zaurus.c |3
include/linux/usb/rndis_host.h | 274
include/linux/usb/usbnet.h | 214 +++
15 files changed, 500 insertions(+), 511 deletions(-)
diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c
index 569028b..6f245cf 100644
--- a/drivers/net/usb/asix.c
+++ b/drivers/net/usb/asix.c
@@ -33,8 +33,7 @@
#include linux/mii.h
#include linux/usb.h
#include linux/crc32.h
-
-#include usbnet.h
+#include linux/usb/usbnet.h
#define DRIVER_VERSION 14-Jun-2006
static const char driver_name [] = asix;
diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c
index 97c17bb..a934428 100644
--- a/drivers/net/usb/cdc_ether.c
+++ b/drivers/net/usb/cdc_ether.c
@@ -31,8 +31,7 @@
#include linux/mii.h
#include linux/usb.h
#include linux/usb/cdc.h
-
-#include usbnet.h
+#include linux/usb/usbnet.h
#if defined(CONFIG_USB_NET_RNDIS_HOST) ||
defined(CONFIG_USB_NET_RNDIS_HOST_MODULE)
diff --git a/drivers/net/usb/cdc_subset.c b/drivers/net/usb/cdc_subset.c
index 943988e..0ec7936 100644
--- a/drivers/net/usb/cdc_subset.c
+++ b/drivers/net/usb/cdc_subset.c
@@ -26,8 +26,7 @@
#include linux/workqueue.h
#include linux/mii.h
#include linux/usb.h
-
-#include usbnet.h
+#include linux/usb/usbnet.h
/*
diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c
index 1ffdd10..5a4e40c 100644
--- a/drivers/net/usb/dm9601.c
+++ b/drivers/net/usb/dm9601.c
@@ -20,8 +20,7 @@
#include linux/mii.h
#include linux/usb.h
#include linux/crc32.h
-
-#include usbnet.h
+#include linux/usb/usbnet.h
/* datasheet:
http://www.davicom.com.tw/big5/download/Data%20Sheet/DM9601-DS-P01-930914.pdf
diff --git a/drivers/net/usb/gl620a.c b/drivers/net/usb/gl620a.c
index 031cf5c..f7ccfad 100644
--- a/drivers/net/usb/gl620a.c
+++ b/drivers/net/usb/gl620a.c
@@ -29,8 +29,7 @@
#include linux/workqueue.h
#include linux/mii.h
#include linux/usb.h
-
-#include usbnet.h
+#include linux/usb/usbnet.h
/*
diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c
index 5ea7411..c3d119f 100644
--- a/drivers/net/usb/mcs7830.c
+++ b/drivers/net/usb/mcs7830.c
@@ -31,8 +31,7 @@
#include linux/module.h
#include linux/netdevice.h
#include linux/usb.h
-
-#include usbnet.h
+#include linux/usb/usbnet.h
/* requests */
#define MCS7830_RD_BMREQ (USB_DIR_IN | USB_TYPE_VENDOR | \
diff --git a/drivers/net/usb/net1080.c b/drivers/net/usb/net1080.c
index 19bf8da..034e8a7 100644
--- a/drivers/net/usb/net1080.c
+++ b/drivers/net/usb/net1080.c
@@ -28,11 +28,10 @@
#include linux/workqueue.h
#include linux/mii.h
#include linux/usb.h
+#include linux/usb/usbnet.h
#include asm/unaligned.h
-#include usbnet.h
-
/*
* Netchip 1080 driver ... http://www.netchip.com
diff --git a/drivers/net/usb/plusb.c b/drivers/net/usb/plusb.c
index 4530093..08555f8 100644
--- a/drivers/net/usb/plusb.c
+++ b/drivers/net/usb/plusb.c
@@ -28,8 +28,7 @@
#include linux/workqueue.h
#include linux/mii.h
#include linux/usb.h
-
-#include usbnet.h
+#include linux/usb/usbnet.h
/*
diff --git a/drivers/net/usb/rndis_host.c b/drivers/net/usb/rndis_host.c
index 825ff51..411314e 100644
--- a/drivers/net/usb/rndis_host.c
+++ b/drivers/net/usb/rndis_host.c
@@ -29,9 +29,8 @@
#include linux/mii.h
#include linux/usb.h
#include linux/usb/cdc.h
-
-#include usbnet.h
-#include rndis_host.h
+#include linux/usb/usbnet.h
+#include linux/usb/rndis_host.h
/*
diff --git a/drivers/net/usb/rndis_host.h b/drivers/net/usb/rndis_host.h
deleted file mode 100644
index edc1d4a..000
--- a/drivers/net/usb/rndis_host.h
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
- * Host Side support for RNDIS Networking Links
- * Copyright (C) 2005 by David Brownell
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *
