From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Tue, 14 Oct 2008 21:24:51 +0000 (+0100)
Subject: Merge branch 's3c-move' into devel
X-Git-Tag: v2.6.28-rc1~293^2~1
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4;p=linux-2.6-omap-h63xx.git

Merge branch 's3c-move' into devel

Conflicts:

	arch/arm/mach-versatile/core.c
---

7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4
diff --cc arch/arm/Makefile
index 94003142082,0e97f5cc541..7d5121260fd
--- a/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-s3c2410/clock.c
index fef646c36b5,c9ac206f349..4e07943c1e2
--- a/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/usb-simtec.c
index eb6fc0bfd47,a8a2c28722b..6078f09b7df
--- a/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 5fbaac6054f,8be4cd67738..96d9eb15424
--- a/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 dcfff6b8b95,6038e9f30ad..ba0591e71f3
--- a/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-s3c2440/s3c2440.c
index c81cdb33071,52e527eebee..ac1f7ea5f40
--- a/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-s3c2443/dma.c
index 5d9ee772659,438a0196088..f73ccb25ff9
--- a/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-versatile/core.c
index 824121d52b8,b638f10411e..1553d986dcb
--- a/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-s3c24xx/devs.c
index 6b13b5455df,8cf4b1b32b0..e93f8bf6d33
--- a/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/pm.c
index d3934b1119a,d937ff1a9ac..8efb57ad501
--- a/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/time.c
index 64bfa19ae95,0bba4bf25a9..c51916236ac
--- a/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>