speedtch cxacru.c, 1.32, 1.33 speedtch.c, 1.63, 1.64 testatm.c, 1.6, 1.7 xusbatm.c, 1.12, 1.13

[Duncan Sands]

Update of /home/cvs/speedtch
In directory phoenix.infradead.org:/tmp/cvs-serv11000

Modified Files:
	cxacru.c speedtch.c testatm.c xusbatm.c 
Log Message:
Revert previous patch.


Index: cxacru.c
===================================================================
RCS file: /home/cvs/speedtch/cxacru.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- cxacru.c	7 Sep 2005 20:49:42 -0000	1.32
+++ cxacru.c	9 Sep 2005 12:49:12 -0000	1.33
@@ -27,8 +27,6 @@
  *  into usbatm), and the userspace firmware loading utility.
  */
 
-#include "usbatm.h"
-
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/kernel.h>
@@ -39,6 +37,8 @@
 #include <linux/device.h>	/* FIXME: linux/firmware.h should include it itself */
 #include <linux/firmware.h>
 
+#include "usbatm.h"
+
 #define DRIVER_AUTHOR	"Roman Kagan, David Woodhouse, Duncan Sands"
 #define DRIVER_VERSION	"0.2"
 #define DRIVER_DESC	"Conexant AccessRunner ADSL USB modem driver"

Index: speedtch.c
===================================================================
RCS file: /home/cvs/speedtch/speedtch.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- speedtch.c	7 Sep 2005 20:49:42 -0000	1.63
+++ speedtch.c	9 Sep 2005 12:49:12 -0000	1.64
@@ -23,8 +23,6 @@
  *
  ******************************************************************************/
 
-#include "usbatm.h"
-
 #include <asm/page.h>
 #include <linux/device.h>
 #include <linux/errno.h>
@@ -39,6 +37,8 @@
 #include <linux/timer.h>
 #include <linux/workqueue.h>
 
+#include "usbatm.h"
+
 #define DRIVER_AUTHOR	"Johan Verrept, Duncan Sands <duncan.sands at free.fr>"
 #define DRIVER_VERSION	"1.9"
 #define DRIVER_DESC	"Alcatel SpeedTouch USB driver version " DRIVER_VERSION

Index: testatm.c
===================================================================
RCS file: /home/cvs/speedtch/testatm.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- testatm.c	7 Sep 2005 20:49:42 -0000	1.6
+++ testatm.c	9 Sep 2005 12:49:12 -0000	1.7
@@ -17,11 +17,11 @@
  *
  ******************************************************************************/
 
-#include "usbatm.h"
-
 #include <linux/delay.h>
 #include <linux/module.h>
 
+#include "usbatm.h"
+
 uint	driver;
 module_param(driver, uint, 0444);
 

Index: xusbatm.c
===================================================================
RCS file: /home/cvs/speedtch/xusbatm.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xusbatm.c	7 Sep 2005 20:49:42 -0000	1.12
+++ xusbatm.c	9 Sep 2005 12:49:12 -0000	1.13
@@ -19,12 +19,12 @@
  *
  ******************************************************************************/
 
-#include "usbatm.h"
-
 #include <linux/module.h>
 #include <linux/netdevice.h>		/* FIXME: required by linux/etherdevice.h */
 #include <linux/etherdevice.h>		/* for random_ether_addr() */
 
+#include "usbatm.h"
+
 
 #define XUSBATM_DRIVERS_MAX	8