From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 31 Oct 2005 15:32:56 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4fd5f8267dd37aaebadfabe71d9c808821eea05a;p=openwrt%2Fstaging%2Fblogic.git

Merge kernel.org:/home/rmk/linux-2.6-drvmodel

Manual #include fixups for clashes - there may be some unnecessary
---

4fd5f8267dd37aaebadfabe71d9c808821eea05a
diff --cc arch/arm/common/scoop.c
index 4af0cf5f3bfb,68b06d16f253..bb4eff614413
--- a/arch/arm/common/scoop.c
+++ b/arch/arm/common/scoop.c
@@@ -11,10 -11,7 +11,9 @@@
   *
   */
  
 +#include <linux/device.h>
 +#include <linux/string.h>
- #include <linux/slab.h>
- 
+ #include <linux/platform_device.h>
  #include <asm/io.h>
  #include <asm/hardware/scoop.h>
  
diff --cc arch/arm/mach-pxa/generic.c
index 9c0289333301,afd5063b0ebe..9b48a90aefce
--- a/arch/arm/mach-pxa/generic.c
+++ b/arch/arm/mach-pxa/generic.c
@@@ -20,10 -20,9 +20,10 @@@
  #include <linux/kernel.h>
  #include <linux/init.h>
  #include <linux/delay.h>
- #include <linux/device.h>
+ #include <linux/platform_device.h>
  #include <linux/ioport.h>
  #include <linux/pm.h>
 +#include <linux/string.h>
  
  #include <asm/hardware.h>
  #include <asm/irq.h>
diff --cc arch/arm/mach-sa1100/generic.c
index 83eba8b54816,976380bde417..2abdc419e984
--- a/arch/arm/mach-sa1100/generic.c
+++ b/arch/arm/mach-sa1100/generic.c
@@@ -17,7 -17,7 +17,8 @@@
  #include <linux/pm.h>
  #include <linux/cpufreq.h>
  #include <linux/ioport.h>
 +#include <linux/sched.h>	/* just for sched_clock() - funny that */
+ #include <linux/platform_device.h>
  
  #include <asm/div64.h>
  #include <asm/hardware.h>
diff --cc arch/arm/mach-sa1100/jornada720.c
index 89af0c831e8f,9fb65cffa578..2f671cc3cb99
--- a/arch/arm/mach-sa1100/jornada720.c
+++ b/arch/arm/mach-sa1100/jornada720.c
@@@ -6,10 -6,8 +6,10 @@@
  #include <linux/kernel.h>
  #include <linux/tty.h>
  #include <linux/delay.h>
- #include <linux/device.h>
+ #include <linux/platform_device.h>
  #include <linux/ioport.h>
 +#include <linux/mtd/mtd.h>
 +#include <linux/mtd/partitions.h>
  
  #include <asm/hardware.h>
  #include <asm/hardware/sa1111.h>
diff --cc arch/mips/au1000/common/platform.c
index 1f7b465c8038,3c778d0f58a6..48d3f54f88f8
--- a/arch/mips/au1000/common/platform.c
+++ b/arch/mips/au1000/common/platform.c
@@@ -7,8 -7,7 +7,9 @@@
   * License version 2.  This program is licensed "as is" without any
   * warranty of any kind, whether express or implied.
   */
 +#include <linux/config.h>
 +#include <linux/device.h>
+ #include <linux/platform_device.h>
  #include <linux/kernel.h>
  #include <linux/init.h>
  #include <linux/resource.h>
diff --cc drivers/mtd/maps/bast-flash.c
index 63104c73ca3c,5f248ebe68e0..bfe994e59265
--- a/drivers/mtd/maps/bast-flash.c
+++ b/drivers/mtd/maps/bast-flash.c
@@@ -32,9 -32,8 +32,9 @@@
  #include <linux/kernel.h>
  #include <linux/string.h>
  #include <linux/ioport.h>
 +#include <linux/device.h>
 +#include <linux/slab.h>
- 
+ #include <linux/platform_device.h>
 -
  #include <linux/mtd/mtd.h>
  #include <linux/mtd/map.h>
  #include <linux/mtd/partitions.h>
diff --cc drivers/mtd/maps/ixp2000.c
index 1e5d6e1d05f3,6815baee89d7..00b9f67580f1
--- a/drivers/mtd/maps/ixp2000.c
+++ b/drivers/mtd/maps/ixp2000.c
@@@ -22,10 -22,6 +22,11 @@@
  #include <linux/init.h>
  #include <linux/kernel.h>
  #include <linux/string.h>
 +#include <linux/slab.h>
 +#include <linux/ioport.h>
 +#include <linux/device.h>
++#include <linux/platform_device.h>
 +
  #include <linux/mtd/mtd.h>
  #include <linux/mtd/map.h>
  #include <linux/mtd/partitions.h>
diff --cc drivers/mtd/maps/ixp4xx.c
index da316e543237,06e1c7fffed3..733a9297a562
--- a/drivers/mtd/maps/ixp4xx.c
+++ b/drivers/mtd/maps/ixp4xx.c
@@@ -20,10 -20,6 +20,11 @@@
  #include <linux/init.h>
  #include <linux/kernel.h>
  #include <linux/string.h>
 +#include <linux/slab.h>
 +#include <linux/ioport.h>
 +#include <linux/device.h>
++#include <linux/platform_device.h>
 +
  #include <linux/mtd/mtd.h>
  #include <linux/mtd/map.h>
  #include <linux/mtd/partitions.h>
diff --cc drivers/mtd/maps/plat-ram.c
index a0577ea00c3c,e751e05fcc65..104576b5be34
--- a/drivers/mtd/maps/plat-ram.c
+++ b/drivers/mtd/maps/plat-ram.c
@@@ -29,8 -29,7 +29,9 @@@
  #include <linux/kernel.h>
  #include <linux/string.h>
  #include <linux/ioport.h>
 +#include <linux/device.h>
 +#include <linux/slab.h>
+ #include <linux/platform_device.h>
  
  #include <linux/mtd/mtd.h>
  #include <linux/mtd/map.h>
diff --cc drivers/mtd/nand/s3c2410.c
index b58ba236a9eb,bf2325df80c7..2df5e47d1f5c
--- a/drivers/mtd/nand/s3c2410.c
+++ b/drivers/mtd/nand/s3c2410.c
@@@ -48,10 -48,9 +48,10 @@@
  #include <linux/kernel.h>
  #include <linux/string.h>
  #include <linux/ioport.h>
- #include <linux/device.h>
+ #include <linux/platform_device.h>
  #include <linux/delay.h>
  #include <linux/err.h>
 +#include <linux/slab.h>
  
  #include <linux/mtd/mtd.h>
  #include <linux/mtd/nand.h>
diff --cc drivers/pcmcia/pxa2xx_sharpsl.c
index bd924336a49f,b54a8b8c0fca..fe5ea36e7de3
--- a/drivers/pcmcia/pxa2xx_sharpsl.c
+++ b/drivers/pcmcia/pxa2xx_sharpsl.c
@@@ -16,9 -16,8 +16,9 @@@
  #include <linux/kernel.h>
  #include <linux/errno.h>
  #include <linux/interrupt.h>
- #include <linux/device.h>
+ #include <linux/platform_device.h>
  
 +#include <asm/mach-types.h>
  #include <asm/hardware.h>
  #include <asm/irq.h>
  #include <asm/hardware/scoop.h>
diff --cc drivers/usb/host/ohci-omap.c
index 49815ec4b842,277bcb902d3b..e46cc540cf4d
--- a/drivers/usb/host/ohci-omap.c
+++ b/drivers/usb/host/ohci-omap.c
@@@ -14,8 -14,7 +14,9 @@@
   * This file is licenced under the GPL.
   */
  
 +#include <linux/signal.h>	/* SA_INTERRUPT */
 +#include <linux/jiffies.h>
+ #include <linux/platform_device.h>
  
  #include <asm/hardware.h>
  #include <asm/io.h>
diff --cc drivers/usb/host/ohci-pxa27x.c
index f4a4aeda40b7,5181999c56c9..59e20568e8f9
--- a/drivers/usb/host/ohci-pxa27x.c
+++ b/drivers/usb/host/ohci-pxa27x.c
@@@ -19,8 -19,7 +19,10 @@@
   * This file is licenced under the GPL.
   */
  
 +#include <linux/device.h>
 +#include <linux/signal.h>
+ #include <linux/platform_device.h>
++
  #include <asm/mach-types.h>
  #include <asm/hardware.h>
  #include <asm/arch/pxa-regs.h>