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 4af0cf5,68b06d1..bb4eff6
--- 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 9c02893,afd5063..9b48a90
--- 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 83eba8b,976380b..2abdc41
--- 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 89af0c8,9fb65cf..2f671cc
--- 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 1f7b465,3c778d0..48d3f54
--- 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 63104c7,5f248eb..bfe994e
--- 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 1e5d6e1,6815bae..00b9f67
--- 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 da316e5,06e1c7f..733a929
--- 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 a0577ea,e751e05..104576b
--- 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 b58ba23,bf2325d..2df5e47
--- 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 bd92433,b54a8b8..fe5ea36
--- 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 49815ec,277bcb9..e46cc54
--- 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 f4a4aed,5181999..59e2056
--- 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