Merge branch 'next-s3c24xx-cpufreq' into next-s3c

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

diff --cc arch/arm/plat-s3c24xx/Kconfig
index aaae456018b5ac2ae5b6b25eeea58e01e91dd130,f0b9c73fe0080200e07b3405867901702ccfde40..2f914568359661cd78ad7ecf874a2cb741599632
--- 1/arch/arm/plat-s3c24xx/Kconfig
--- 2/arch/arm/plat-s3c24xx/Kconfig
+++ b/arch/arm/plat-s3c24xx/Kconfig
@@@ -105,14 -139,33 +139,39 @@@ config S3C24XX_SPI_BUS1_GPG5_GPG6_GPG
          SPI GPIO configuration code for BUS 1 when connected to
          GPG5, GPG6 and GPG7.
  
 +config S3C24XX_SPI_BUS1_GPD8_GPD9_GPD10
 +      bool
 +      help
 +        SPI GPIO configuration code for BUS 1 when connected to
 +        GPD8, GPD9 and GPD10.
 +
  # common code for s3c24xx based machines, such as the SMDKs.
  
+ # cpu frequency items common between s3c2410 and s3c2440/s3c2442
+ 
+ config S3C2410_IOTIMING
+       bool
+       depends on CPU_FREQ_S3C24XX
+       help
+         Internal node to select io timing code that is common to the s3c2410
+         and s3c2440/s3c2442 cpu frequency support.
+ 
+ config S3C2410_CPUFREQ_UTILS
+       bool
+       depends on CPU_FREQ_S3C24XX
+       help
+         Internal node to select timing code that is common to the s3c2410
+         and s3c2440/s3c244 cpu frequency support.
+ 
+ # cpu frequency support common to s3c2412, s3c2413 and s3c2442
+ 
+ config S3C2412_IOTIMING
+       bool
+       depends on CPU_FREQ_S3C24XX && (CPU_S3C2412 || CPU_S3C2443)
+       help
+         Intel node to select io timing code that is common to the s3c2412
+         and the s3c2443.
+ 
  config MACH_SMDK
        bool
        help

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