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

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

diff --cc arch/arm/common/scoop.c
index 4af0cf5f3bfbc8d4f8fce84fc508f465c6ddf10a,68b06d16f2535ec9eab25264a3fe1d70dad5bea5..bb4eff61441307458f92a104b0fa655542e118b7
--- 1/arch/arm/common/scoop.c
--- 2/arch/arm/common/scoop.c
+++ b/arch/arm/common/scoop.c
@@@ -11,10 -11,7 +11,9 @@@
   *
   */
  
- #include <linux/slab.h>
- 
 +#include <linux/device.h>
 +#include <linux/string.h>
+ #include <linux/platform_device.h>
  #include <asm/io.h>
  #include <asm/hardware/scoop.h>
  

diff --cc arch/arm/mach-imx/generic.c
Simple merge

diff --cc arch/arm/mach-integrator/integrator_ap.c
Simple merge

diff --cc arch/arm/mach-pxa/corgi.c
Simple merge

diff --cc arch/arm/mach-pxa/generic.c
index 9c0289333301e9c5f0c0dc252c9990fbd20a8646,afd5063b0ebe7bafd383a4395542f4cebe3d462b..9b48a90aefce9d4a25910f513d190c1e7ae7d8c5
--- 1/arch/arm/mach-pxa/generic.c
--- 2/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-pxa/poodle.c
Simple merge

diff --cc arch/arm/mach-pxa/spitz.c
Simple merge

diff --cc arch/arm/mach-sa1100/generic.c
index 83eba8b54816681f217807dd2ef0dccd76d10288,976380bde4172d5552b368ea1eb983b528f81fd7..2abdc419e9848a8056918d62cdb72a1841bdb806
--- 1/arch/arm/mach-sa1100/generic.c
--- 2/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 89af0c831e8fde6621856dec34c23dc0dfef774b,9fb65cffa5788b46ac662e9caf1f1787916b7260..2f671cc3cb99f793a1a186ccae7eeffebd699883
--- 1/arch/arm/mach-sa1100/jornada720.c
--- 2/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 1f7b465c8038bab56d5d7d1346544eeb9cc6b733,3c778d0f58a6acd3fa73ff1820eead603bc38a3c..48d3f54f88f88e23bfb4a134cb9a2fd4c12416c8
--- 1/arch/mips/au1000/common/platform.c
--- 2/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 arch/ppc/platforms/chrp_pegasos_eth.c
Simple merge

diff --cc arch/ppc/platforms/ev64360.c
Simple merge

diff --cc arch/ppc/platforms/hdpu.c
Simple merge

diff --cc arch/ppc/platforms/katana.c
Simple merge

diff --cc arch/ppc/platforms/radstone_ppc7d.c
Simple merge

diff --cc arch/ppc/syslib/mv64x60.c
Simple merge

diff --cc arch/ppc/syslib/pq2_devices.c
Simple merge

diff --cc drivers/base/platform.c
Simple merge

diff --cc drivers/mmc/pxamci.c
Simple merge

diff --cc drivers/mtd/maps/bast-flash.c
index 63104c73ca3c8bb7caadb6e3b038318fcffd06ec,5f248ebe68e05528cd22eef20fad2f237834cb31..bfe994e59265d57772da814b0b08eab199e2e793
--- 1/drivers/mtd/maps/bast-flash.c
--- 2/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 1e5d6e1d05f318c1f0e45c866ed465a825fe6b6c,6815baee89d763ce98e341fe858e103b3778bf44..00b9f67580f1566550950327479fd59af1ca2a33
--- 1/drivers/mtd/maps/ixp2000.c
--- 2/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 da316e543237676e8fdf61a6a98923f06d27adca,06e1c7fffed3f2856c5c55482d9632577f50f740..733a9297a56263eda2c49bfe7db2545f86ed78d6
--- 1/drivers/mtd/maps/ixp4xx.c
--- 2/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/omap_nor.c
Simple merge

diff --cc drivers/mtd/maps/plat-ram.c
index a0577ea00c3c974bb1121d5a11d9cac0765c82b4,e751e05fcc651f01517b99d51563d3a14371bdfd..104576b5be3480cf238f1f4c3ac0a6c9bbfeca8f
--- 1/drivers/mtd/maps/plat-ram.c
--- 2/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/maps/sa1100-flash.c
Simple merge

diff --cc drivers/mtd/nand/s3c2410.c
index b58ba236a9eb8a5ffd479da0b56d88a041acc860,bf2325df80c71d19e3a504e67dd42acb3fed9ffd..2df5e47d1f5ce2ec7c16a9ab6018d7e4be6c1eff
--- 1/drivers/mtd/nand/s3c2410.c
--- 2/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/net/irda/pxaficp_ir.c
Simple merge

diff --cc drivers/net/irda/smsc-ircc2.c
Simple merge

diff --cc drivers/net/mv643xx_eth.c
Simple merge

diff --cc drivers/net/smc91x.c
Simple merge

diff --cc drivers/pcmcia/au1000_generic.c
Simple merge

diff --cc drivers/pcmcia/pxa2xx_sharpsl.c
index bd924336a49fe041333745766c3358a1ecc020d4,b54a8b8c0fca000b908c454bf90d47f230e3c8b7..fe5ea36e7de3878e63b7819cab7872c89d8acd49
--- 1/drivers/pcmcia/pxa2xx_sharpsl.c
--- 2/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/pcmcia/sa1100_generic.c
Simple merge

diff --cc drivers/serial/mpsc.c
Simple merge

diff --cc drivers/usb/host/ohci-omap.c
index 49815ec4b842374959f3aab35fa388d290196168,277bcb902d3b94ae86bed365250defb34dd9799a..e46cc540cf4d3153fb49d9b942dfdf5652dc4f76
--- 1/drivers/usb/host/ohci-omap.c
--- 2/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 f4a4aeda40b7e3f1876f20dfa7371adeaba70db7,5181999c56c9232bf449b4f37bf8276d33632612..59e20568e8f947381753f590fdebf8b5467267bb
--- 1/drivers/usb/host/ohci-pxa27x.c
--- 2/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>

diff --cc drivers/video/gbefb.c
Simple merge