Merge branch 's3c-move' into devel

Conflicts:

	arch/arm/mach-versatile/core.c

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Makefile
index 94003142082c6a64182059cb962d6eb559583d55,0e97f5cc5417428633f50c97594c7776c02e332d..7d5121260fda0370fe85303120544af07689cf79
--- 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 fef646c36b540600576e83f4e982e2983302099b,c9ac206f349b501571b178c50a5d800d857a76d1..4e07943c1e29116603aef7427ec41410084949ed
--- 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 eb6fc0bfd47ecd8f1e28f7b4e49fc0d31dedcb86,a8a2c28722b96a653b3e98de51447336568b4abe..6078f09b7df5d9311cc42ab7796e9b16271cb10c
--- 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 5fbaac6054f8a0ce3fb9f94163308a42074f9d4a,8be4cd677385124f6761ec4c661caf830c1f0865..96d9eb15424f38087ec3b2a210add4ab7ea4d842
--- 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 dcfff6b8b95854c173211b70d2babfb740cc75ea,6038e9f30ad8042c6b9092ff81e0c0a7a7052fb3..ba0591e71f329aff73ae383c3549f22d17390507
--- 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 c81cdb330712cdb3bc16ac708fe4fba4b6b255cd,52e527eebee41c3551dfcd7578ba3380639128bf..ac1f7ea5f405ff342a3b1fd550eb940e43df0486
--- 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 5d9ee772659bd73ca696415d205522e6a31fac1c,438a01960882eaab8a0a90d86ebcc1f2b3127f97..f73ccb25ff9488136cbcbae50e16a1a03f5b384d
--- 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 824121d52b8d1d20fe2365c615345022c757fc2b,b638f10411e8e27b573f926133e141922512204b..1553d986dcbdc51a6155eb1016ed383d9819cdf7
--- 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 6b13b5455dfc6b32935da3d3bcac491a9e284f2e,8cf4b1b32b05fa7a44f6c47b62c4fa46a4023404..e93f8bf6d3386659e175e1248adfea8178982bf4
--- 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 d3934b1119a9e0c855f3e16153c6bad696f26144,d937ff1a9ac5476f21eb66bf7e17ed6ab624b30d..8efb57ad501948974b0400c3f5ed75910506575d
--- 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 64bfa19ae951c1444d8741835ef49d12f1f27432,0bba4bf25a95fc0a8a0a7009fe539b4287126767..c51916236ac082bfad855f9ecc6d93588a9fbdc1
--- 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