Merge branch 'next-s3c24xx' into next-merged

diff --cc arch/arm/mach-s3c2440/Kconfig
index 402213dc5d85e0079dbc7341952cad3a41eff1b9,57b9c57ff2b41034eb63864bde8533aebc010a76..cde5ae9a43400e650f280641019a9bf4c3c7973e
--- 1/arch/arm/mach-s3c2440/Kconfig
--- 2/arch/arm/mach-s3c2440/Kconfig
+++ b/arch/arm/mach-s3c2440/Kconfig
@@@ -29,9 -29,9 +29,10 @@@ menu "S3C2440 Machines
  config MACH_ANUBIS
        bool "Simtec Electronics ANUBIS"
        select CPU_S3C2440
+       select S3C24XX_DCLK
        select PM_SIMTEC if PM
        select HAVE_PATA_PLATFORM
 +      select S3C24XX_GPIO_EXTRA64
        help
          Say Y here if you are using the Simtec Electronics ANUBIS
          development system
@@@ -39,8 -39,8 +40,9 @@@
  config MACH_OSIRIS
        bool "Simtec IM2440D20 (OSIRIS) module"
        select CPU_S3C2440
+       select S3C24XX_DCLK
        select PM_SIMTEC if PM
 +      select S3C24XX_GPIO_EXTRA128
        help
          Say Y here if you are using the Simtec IM2440D20 module, also
          known as the Osiris.

diff --cc arch/arm/plat-s3c24xx/Kconfig
Simple merge