Merge master.kernel.org:/home/acme/BK/includes-2.5

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

drivers/net/hamradio/soundmodem/sm_sbc.c

@@ -26,13 +26,14 @@
  */
 
 #include <linux/ptrace.h>
-#include <linux/sched.h>
 #include <linux/interrupt.h>
-#include <asm/io.h>
-#include <asm/dma.h>
 #include <linux/ioport.h>
 #include <linux/soundmodem.h>
 #include <linux/delay.h>
+
+#include <asm/io.h>
+#include <asm/dma.h>
+
 #include "sm.h"
 #include "smdma.h"
 

drivers/net/hamradio/soundmodem/sm_wss.c

@@ -26,12 +26,13 @@
  */
 
 #include <linux/ptrace.h>
-#include <linux/sched.h>
 #include <linux/interrupt.h>
-#include <asm/io.h>
-#include <asm/dma.h>
 #include <linux/ioport.h>
 #include <linux/soundmodem.h>
+
+#include <asm/io.h>
+#include <asm/dma.h>
+
 #include "sm.h"
 #include "smdma.h"
 

drivers/net/wan/lmc/lmc_debug.c

 
 #include <linux/types.h>
-#include <linux/sched.h>
 #include <linux/netdevice.h>
 #include <linux/interrupt.h>
 #include <linux/version.h>
+
 #include "lmc_ver.h"
 #include "lmc_debug.h"
 

drivers/net/wan/lmc/lmc_main.c

@@ -40,7 +40,7 @@
 
 #include <linux/version.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
+#include <linux/module.h>
 #include <linux/string.h>
 #include <linux/timer.h>
 #include <linux/ptrace.h>
@@ -51,24 +51,22 @@
 #include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/init.h>
-
 #if LINUX_VERSION_CODE < 0x20155
 #include <linux/bios32.h>
 #endif
-
 #include <linux/in.h>
 #include <linux/if_arp.h>
-#include <asm/processor.h>             /* Processor type for cache alignment. */
-#include <asm/bitops.h>
-#include <asm/io.h>
-#include <asm/dma.h>
-
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
-#include <net/syncppp.h>
 #include <linux/inet.h>
 
+#include <net/syncppp.h>
+
+#include <asm/processor.h>             /* Processor type for cache alignment. */
+#include <asm/bitops.h>
+#include <asm/io.h>
+#include <asm/dma.h>
 #if LINUX_VERSION_CODE >= 0x20200
 #include <asm/uaccess.h>
 //#include <asm/spinlock.h>
@@ -76,8 +74,6 @@
 #define ARPHRD_HDLC 513
 #endif
 
-#include <linux/module.h>
-
 #define DRIVER_MAJOR_VERSION     1
 #define DRIVER_MINOR_VERSION    34
 #define DRIVER_SUB_VERSION       0

drivers/net/wan/lmc/lmc_media.c

@@ -3,7 +3,6 @@
 #include <linux/version.h>
 #include <linux/config.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
 #include <linux/string.h>
 #include <linux/timer.h>
 #include <linux/ptrace.h>
@@ -12,28 +11,25 @@
 #include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>
-//#include <asm/smp.h>
-
 #if LINUX_VERSION_CODE < 0x20155
 #include <linux/bios32.h>
 #endif
-
 #include <linux/in.h>
 #include <linux/if_arp.h>
-#include <asm/processor.h>             /* Processor type for cache alignment. */
-#include <asm/bitops.h>
-#include <asm/io.h>
-#include <asm/dma.h>
-
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
-#include <net/syncppp.h>
 #include <linux/inet.h>
 
+#include <net/syncppp.h>
+
+#include <asm/processor.h>             /* Processor type for cache alignment. */
+#include <asm/bitops.h>
+#include <asm/io.h>
+#include <asm/dma.h>
+
 #if LINUX_VERSION_CODE >= 0x20200
 #include <asm/uaccess.h>
-//#include <asm/spinlock.h>
 #endif
 
 #include "lmc_ver.h"

drivers/net/wan/lmc/lmc_proto.c

@@ -21,7 +21,6 @@
 
 #include <linux/version.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
 #include <linux/string.h>
 #include <linux/timer.h>
 #include <linux/ptrace.h>
@@ -30,23 +29,23 @@
 #include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>
-#include <asm/smp.h>
-
 #include <linux/in.h>
 #include <linux/if_arp.h>
-#include <asm/processor.h>             /* Processor type for cache alignment. */
-#include <asm/bitops.h>
-#include <asm/io.h>
-#include <asm/dma.h>
-
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
-#include <net/syncppp.h>
 #include <linux/inet.h>
 #include <linux/workqueue.h>
 #include <linux/proc_fs.h>
 
+#include <net/syncppp.h>
+
+#include <asm/processor.h>             /* Processor type for cache alignment. */
+#include <asm/bitops.h>
+#include <asm/io.h>
+#include <asm/dma.h>
+#include <asm/smp.h>
+
 #include "lmc_ver.h"
 #include "lmc.h"
 #include "lmc_var.h"