ソースを参照

Move usbnet.h and rndis_host.h to include/linux/usb

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 <jussi.kivilinna@mbnet.fi>
Acked-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Jussi Kivilinna 17 年 前
コミット
3692e94f15

+ 1 - 2
drivers/net/usb/asix.c

@@ -33,8 +33,7 @@
 #include <linux/mii.h>
 #include <linux/mii.h>
 #include <linux/usb.h>
 #include <linux/usb.h>
 #include <linux/crc32.h>
 #include <linux/crc32.h>
-
-#include "usbnet.h"
+#include <linux/usb/usbnet.h>
 
 
 #define DRIVER_VERSION "14-Jun-2006"
 #define DRIVER_VERSION "14-Jun-2006"
 static const char driver_name [] = "asix";
 static const char driver_name [] = "asix";

+ 1 - 2
drivers/net/usb/cdc_ether.c

@@ -31,8 +31,7 @@
 #include <linux/mii.h>
 #include <linux/mii.h>
 #include <linux/usb.h>
 #include <linux/usb.h>
 #include <linux/usb/cdc.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)
 #if defined(CONFIG_USB_NET_RNDIS_HOST) || defined(CONFIG_USB_NET_RNDIS_HOST_MODULE)

+ 1 - 2
drivers/net/usb/cdc_subset.c

@@ -26,8 +26,7 @@
 #include <linux/workqueue.h>
 #include <linux/workqueue.h>
 #include <linux/mii.h>
 #include <linux/mii.h>
 #include <linux/usb.h>
 #include <linux/usb.h>
-
-#include "usbnet.h"
+#include <linux/usb/usbnet.h>
 
 
 
 
 /*
 /*

+ 1 - 2
drivers/net/usb/dm9601.c

@@ -20,8 +20,7 @@
 #include <linux/mii.h>
 #include <linux/mii.h>
 #include <linux/usb.h>
 #include <linux/usb.h>
 #include <linux/crc32.h>
 #include <linux/crc32.h>
-
-#include "usbnet.h"
+#include <linux/usb/usbnet.h>
 
 
 /* datasheet:
 /* datasheet:
  http://www.davicom.com.tw/big5/download/Data%20Sheet/DM9601-DS-P01-930914.pdf
  http://www.davicom.com.tw/big5/download/Data%20Sheet/DM9601-DS-P01-930914.pdf

+ 1 - 2
drivers/net/usb/gl620a.c

@@ -29,8 +29,7 @@
 #include <linux/workqueue.h>
 #include <linux/workqueue.h>
 #include <linux/mii.h>
 #include <linux/mii.h>
 #include <linux/usb.h>
 #include <linux/usb.h>
-
-#include "usbnet.h"
+#include <linux/usb/usbnet.h>
 
 
 
 
 /*
 /*

+ 1 - 2
drivers/net/usb/mcs7830.c

@@ -31,8 +31,7 @@
 #include <linux/module.h>
 #include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/netdevice.h>
 #include <linux/usb.h>
 #include <linux/usb.h>
-
-#include "usbnet.h"
+#include <linux/usb/usbnet.h>
 
 
 /* requests */
 /* requests */
 #define MCS7830_RD_BMREQ	(USB_DIR_IN  | USB_TYPE_VENDOR | \
 #define MCS7830_RD_BMREQ	(USB_DIR_IN  | USB_TYPE_VENDOR | \

+ 1 - 2
drivers/net/usb/net1080.c

@@ -28,11 +28,10 @@
 #include <linux/workqueue.h>
 #include <linux/workqueue.h>
 #include <linux/mii.h>
 #include <linux/mii.h>
 #include <linux/usb.h>
 #include <linux/usb.h>
+#include <linux/usb/usbnet.h>
 
 
 #include <asm/unaligned.h>
 #include <asm/unaligned.h>
 
 
-#include "usbnet.h"
-
 
 
 /*
 /*
  * Netchip 1080 driver ... http://www.netchip.com
  * Netchip 1080 driver ... http://www.netchip.com

+ 1 - 2
drivers/net/usb/plusb.c

@@ -28,8 +28,7 @@
 #include <linux/workqueue.h>
 #include <linux/workqueue.h>
 #include <linux/mii.h>
 #include <linux/mii.h>
 #include <linux/usb.h>
 #include <linux/usb.h>
-
-#include "usbnet.h"
+#include <linux/usb/usbnet.h>
 
 
 
 
 /*
 /*

+ 2 - 3
drivers/net/usb/rndis_host.c

@@ -29,9 +29,8 @@
 #include <linux/mii.h>
 #include <linux/mii.h>
 #include <linux/usb.h>
 #include <linux/usb.h>
 #include <linux/usb/cdc.h>
 #include <linux/usb/cdc.h>
-
-#include "usbnet.h"
-#include "rndis_host.h"
+#include <linux/usb/usbnet.h>
+#include <linux/usb/rndis_host.h>
 
 
 
 
 /*
 /*

+ 1 - 2
drivers/net/usb/usbnet.c

@@ -41,8 +41,7 @@
 #include <linux/workqueue.h>
 #include <linux/workqueue.h>
 #include <linux/mii.h>
 #include <linux/mii.h>
 #include <linux/usb.h>
 #include <linux/usb.h>
-
-#include "usbnet.h"
+#include <linux/usb/usbnet.h>
 
 
 #define DRIVER_VERSION		"22-Aug-2005"
 #define DRIVER_VERSION		"22-Aug-2005"
 
 

+ 1 - 2
drivers/net/usb/zaurus.c

@@ -29,8 +29,7 @@
 #include <linux/crc32.h>
 #include <linux/crc32.h>
 #include <linux/usb.h>
 #include <linux/usb.h>
 #include <linux/usb/cdc.h>
 #include <linux/usb/cdc.h>
-
-#include "usbnet.h"
+#include <linux/usb/usbnet.h>
 
 
 
 
 /*
 /*

+ 0 - 0
drivers/net/usb/rndis_host.h → include/linux/usb/rndis_host.h


+ 0 - 0
drivers/net/usb/usbnet.h → include/linux/usb/usbnet.h