Merge branch 's3c-move' into devel

Conflicts:

	arch/arm/mach-versatile/core.c

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Makefile
index 9400314,0e97f5c..7d51212
--- 1/arch/arm/Makefile
--- 2/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -118,10 -118,9 +118,10 @@@ endi
   machine-$(CONFIG_ARCH_IXP23XX)    := ixp23xx
   machine-$(CONFIG_ARCH_OMAP1)    := omap1
   machine-$(CONFIG_ARCH_OMAP2)    := omap2
 + machine-$(CONFIG_ARCH_OMAP3)    := omap2
      plat-$(CONFIG_ARCH_OMAP)     := omap
   machine-$(CONFIG_ARCH_S3C2410)          := s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443
-     plat-$(CONFIG_PLAT_S3C24XX)          := s3c24xx
+     plat-$(CONFIG_PLAT_S3C24XX)          := s3c24xx s3c
   machine-$(CONFIG_ARCH_LH7A40X)          := lh7a40x
   machine-$(CONFIG_ARCH_VERSATILE)  := versatile
   machine-$(CONFIG_ARCH_IMX)      := imx

diff --cc arch/arm/mach-davinci/psc.c
Simple merge

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

diff --cc arch/arm/mach-s3c2410/bast-irq.c
Simple merge

diff --cc arch/arm/mach-s3c2410/clock.c
index fef646c,c9ac206..4e07943
--- 1/arch/arm/mach-s3c2410/clock.c
--- 2/arch/arm/mach-s3c2410/clock.c
+++ b/arch/arm/mach-s3c2410/clock.c
@@@ -36,8 -35,9 +36,8 @@@
  #include <asm/mach/map.h>
  
  #include <mach/hardware.h>
 -#include <asm/io.h>
  
- #include <asm/plat-s3c/regs-serial.h>
+ #include <plat/regs-serial.h>
  #include <mach/regs-clock.h>
  #include <mach/regs-gpio.h>
  

diff --cc arch/arm/mach-s3c2410/mach-amlm5900.c
Simple merge

diff --cc arch/arm/mach-s3c2410/mach-bast.c
Simple merge

diff --cc arch/arm/mach-s3c2410/mach-h1940.c
Simple merge

diff --cc arch/arm/mach-s3c2410/mach-n30.c
Simple merge

diff --cc arch/arm/mach-s3c2410/mach-otom.c
Simple merge

diff --cc arch/arm/mach-s3c2410/mach-qt2410.c
Simple merge

diff --cc arch/arm/mach-s3c2410/mach-smdk2410.c
Simple merge

diff --cc arch/arm/mach-s3c2410/mach-tct_hammer.c
Simple merge

diff --cc arch/arm/mach-s3c2410/mach-vr1000.c
Simple merge

diff --cc arch/arm/mach-s3c2410/pm.c
Simple merge

diff --cc arch/arm/mach-s3c2410/s3c2410.c
Simple merge

diff --cc arch/arm/mach-s3c2410/usb-simtec.c
index eb6fc0b,a8a2c28..6078f09
--- 1/arch/arm/mach-s3c2410/usb-simtec.c
--- 2/arch/arm/mach-s3c2410/usb-simtec.c
+++ b/arch/arm/mach-s3c2410/usb-simtec.c
@@@ -33,9 -32,10 +33,9 @@@
  #include <mach/regs-gpio.h>
  
  #include <mach/hardware.h>
 -#include <asm/io.h>
  #include <asm/irq.h>
  
- #include <asm/plat-s3c24xx/devs.h>
+ #include <plat/devs.h>
  #include "usb-simtec.h"
  
  /* control power and monitor over-current events on various Simtec

diff --cc arch/arm/mach-s3c2412/clock.c
index 5fbaac6,8be4cd6..96d9eb1
--- 1/arch/arm/mach-s3c2412/clock.c
--- 2/arch/arm/mach-s3c2412/clock.c
+++ b/arch/arm/mach-s3c2412/clock.c
@@@ -36,8 -35,9 +36,8 @@@
  #include <asm/mach/map.h>
  
  #include <mach/hardware.h>
 -#include <asm/io.h>
  
- #include <asm/plat-s3c/regs-serial.h>
+ #include <plat/regs-serial.h>
  #include <mach/regs-clock.h>
  #include <mach/regs-gpio.h>
  

diff --cc arch/arm/mach-s3c2412/dma.c
index dcfff6b,6038e9f..ba0591e
--- 1/arch/arm/mach-s3c2412/dma.c
--- 2/arch/arm/mach-s3c2412/dma.c
+++ b/arch/arm/mach-s3c2412/dma.c
@@@ -20,11 -19,12 +20,11 @@@
  
  #include <asm/dma.h>
  #include <mach/dma.h>
 -#include <asm/io.h>
  
- #include <asm/plat-s3c24xx/dma.h>
- #include <asm/plat-s3c24xx/cpu.h>
+ #include <plat/dma.h>
+ #include <plat/cpu.h>
  
- #include <asm/plat-s3c/regs-serial.h>
+ #include <plat/regs-serial.h>
  #include <mach/regs-gpio.h>
  #include <asm/plat-s3c/regs-ac97.h>
  #include <mach/regs-mem.h>

diff --cc arch/arm/mach-s3c2412/irq.c
Simple merge

diff --cc arch/arm/mach-s3c2412/mach-smdk2413.c
Simple merge

diff --cc arch/arm/mach-s3c2412/mach-vstms.c
Simple merge

diff --cc arch/arm/mach-s3c2412/pm.c
Simple merge

diff --cc arch/arm/mach-s3c2412/s3c2412.c
Simple merge

diff --cc arch/arm/mach-s3c2440/clock.c
Simple merge

diff --cc arch/arm/mach-s3c2440/dsc.c
Simple merge

diff --cc arch/arm/mach-s3c2440/irq.c
Simple merge

diff --cc arch/arm/mach-s3c2440/mach-anubis.c
Simple merge

diff --cc arch/arm/mach-s3c2440/mach-nexcoder.c
Simple merge

diff --cc arch/arm/mach-s3c2440/mach-osiris.c
Simple merge

diff --cc arch/arm/mach-s3c2440/mach-rx3715.c
Simple merge

diff --cc arch/arm/mach-s3c2440/mach-smdk2440.c
Simple merge

diff --cc arch/arm/mach-s3c2440/s3c2440.c
index c81cdb3,52e527e..ac1f7ea
--- 1/arch/arm/mach-s3c2440/s3c2440.c
--- 2/arch/arm/mach-s3c2440/s3c2440.c
+++ b/arch/arm/mach-s3c2440/s3c2440.c
@@@ -27,11 -26,12 +27,11 @@@
  #include <asm/mach/irq.h>
  
  #include <mach/hardware.h>
 -#include <asm/io.h>
  #include <asm/irq.h>
  
- #include <asm/plat-s3c24xx/s3c2440.h>
- #include <asm/plat-s3c24xx/devs.h>
- #include <asm/plat-s3c24xx/cpu.h>
+ #include <plat/s3c2440.h>
+ #include <plat/devs.h>
+ #include <plat/cpu.h>
  
  static struct sys_device s3c2440_sysdev = {
        .cls            = &s3c2440_sysclass,

diff --cc arch/arm/mach-s3c2442/clock.c
Simple merge

diff --cc arch/arm/mach-s3c2443/clock.c
Simple merge

diff --cc arch/arm/mach-s3c2443/dma.c
index 5d9ee77,438a019..f73ccb2
--- 1/arch/arm/mach-s3c2443/dma.c
--- 2/arch/arm/mach-s3c2443/dma.c
+++ b/arch/arm/mach-s3c2443/dma.c
@@@ -20,11 -19,12 +20,11 @@@
  
  #include <asm/dma.h>
  #include <mach/dma.h>
 -#include <asm/io.h>
  
- #include <asm/plat-s3c24xx/dma.h>
- #include <asm/plat-s3c24xx/cpu.h>
+ #include <plat/dma.h>
+ #include <plat/cpu.h>
  
- #include <asm/plat-s3c/regs-serial.h>
+ #include <plat/regs-serial.h>
  #include <mach/regs-gpio.h>
  #include <asm/plat-s3c/regs-ac97.h>
  #include <mach/regs-mem.h>

diff --cc arch/arm/mach-s3c2443/irq.c
Simple merge

diff --cc arch/arm/mach-s3c2443/mach-smdk2443.c
Simple merge

diff --cc arch/arm/mach-s3c2443/s3c2443.c
Simple merge

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

diff --cc arch/arm/mach-versatile/core.c
index 824121d,b638f10..1553d98
--- 1/arch/arm/mach-versatile/core.c
--- 2/arch/arm/mach-versatile/core.c
+++ b/arch/arm/mach-versatile/core.c
@@@ -28,11 -28,11 +28,11 @@@
  #include <linux/amba/clcd.h>
  #include <linux/clocksource.h>
  #include <linux/clockchips.h>
 +#include <linux/io.h>
+ #include <linux/cnt32_to_63.h>
  
- #include <asm/cnt32_to_63.h>
  #include <asm/system.h>
  #include <mach/hardware.h>
 -#include <asm/io.h>
  #include <asm/irq.h>
  #include <asm/leds.h>
  #include <asm/hardware/arm_timer.h>

diff --cc arch/arm/plat-omap/devices.c
Simple merge

diff --cc arch/arm/plat-s3c24xx/clock.c
Simple merge

diff --cc arch/arm/plat-s3c24xx/common-smdk.c
Simple merge

diff --cc arch/arm/plat-s3c24xx/cpu.c
Simple merge

diff --cc arch/arm/plat-s3c24xx/devs.c
index 6b13b54,8cf4b1b..e93f8bf
--- 1/arch/arm/plat-s3c24xx/devs.c
--- 2/arch/arm/plat-s3c24xx/devs.c
+++ b/arch/arm/plat-s3c24xx/devs.c
@@@ -26,13 -25,14 +26,13 @@@
  #include <asm/mach/irq.h>
  #include <mach/fb.h>
  #include <mach/hardware.h>
 -#include <asm/io.h>
  #include <asm/irq.h>
  
- #include <asm/plat-s3c/regs-serial.h>
+ #include <plat/regs-serial.h>
  #include <asm/plat-s3c24xx/udc.h>
  
- #include <asm/plat-s3c24xx/devs.h>
- #include <asm/plat-s3c24xx/cpu.h>
+ #include <plat/devs.h>
+ #include <plat/cpu.h>
  #include <asm/plat-s3c24xx/regs-spi.h>
  
  /* Serial port registrations */

diff --cc arch/arm/plat-s3c24xx/dma.c
Simple merge

diff --cc arch/arm/plat-s3c24xx/irq.c
Simple merge

diff --cc arch/arm/plat-s3c24xx/pm-simtec.c
Simple merge

diff --cc arch/arm/plat-s3c24xx/pm.c
index d3934b1,d937ff1..8efb57a
--- 1/arch/arm/plat-s3c24xx/pm.c
--- 2/arch/arm/plat-s3c24xx/pm.c
+++ b/arch/arm/plat-s3c24xx/pm.c
@@@ -39,8 -38,9 +39,8 @@@
  
  #include <asm/cacheflush.h>
  #include <mach/hardware.h>
 -#include <asm/io.h>
  
- #include <asm/plat-s3c/regs-serial.h>
+ #include <plat/regs-serial.h>
  #include <mach/regs-clock.h>
  #include <mach/regs-gpio.h>
  #include <mach/regs-mem.h>

diff --cc arch/arm/plat-s3c24xx/s3c244x-clock.c
Simple merge

diff --cc arch/arm/plat-s3c24xx/s3c244x-irq.c
Simple merge

diff --cc arch/arm/plat-s3c24xx/s3c244x.c
Simple merge

diff --cc arch/arm/plat-s3c24xx/time.c
index 64bfa19,0bba4bf..c519162
--- 1/arch/arm/plat-s3c24xx/time.c
--- 2/arch/arm/plat-s3c24xx/time.c
+++ b/arch/arm/plat-s3c24xx/time.c
@@@ -31,9 -30,10 +31,9 @@@
  #include <asm/leds.h>
  #include <asm/mach-types.h>
  
 -#include <asm/io.h>
  #include <asm/irq.h>
  #include <mach/map.h>
- #include <asm/plat-s3c/regs-timer.h>
+ #include <plat/regs-timer.h>
  #include <mach/regs-irq.h>
  #include <asm/mach/time.h>
  

diff --cc drivers/mfd/Kconfig
Simple merge