Merge branch 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[karo-tx-linux.git] / arch / arm / mach-s3c2440 / Kconfig

diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig
index 8cfeaec373063f8d259dea486e6c4511a58dd2ec..8ae1b288f7fabad82da2bfc35063de07b94fadc8 100644 (file)
--- a/arch/arm/mach-s3c2440/Kconfig
+++ b/arch/arm/mach-s3c2440/Kconfig
@@ -33,6 +33,7 @@ config MACH_ANUBIS
        select PM_SIMTEC if PM
        select HAVE_PATA_PLATFORM
        select S3C24XX_GPIO_EXTRA64
+       select S3C2440_XTAL_12000000
        select S3C_DEV_USB_HOST
        help
          Say Y here if you are using the Simtec Electronics ANUBIS
@@ -44,6 +45,8 @@ config MACH_OSIRIS
        select S3C24XX_DCLK
        select PM_SIMTEC if PM
        select S3C24XX_GPIO_EXTRA128
+       select S3C2440_XTAL_12000000
+       select S3C2410_IOTIMING if S3C2440_CPUFREQ
        select S3C_DEV_USB_HOST
        help
          Say Y here if you are using the Simtec IM2440D20 module, also
@@ -52,6 +55,7 @@ config MACH_OSIRIS
 config MACH_RX3715
        bool "HP iPAQ rx3715"
        select CPU_S3C2440
+       select S3C2440_XTAL_16934400
        select PM_H1940 if PM
        help
          Say Y here if you are using the HP iPAQ rx3715.
@@ -59,6 +63,7 @@ config MACH_RX3715
 config ARCH_S3C2440
        bool "SMDK2440"
        select CPU_S3C2440
+       select S3C2440_XTAL_16934400
        select MACH_SMDK
        select S3C_DEV_USB_HOST
        help
@@ -67,6 +72,7 @@ config ARCH_S3C2440
 config MACH_NEXCODER_2440
        bool "NexVision NEXCODER 2440 Light Board"
        select CPU_S3C2440
+       select S3C2440_XTAL_12000000
        select S3C_DEV_USB_HOST
        help
          Say Y here if you are using the Nex Vision NEXCODER 2440 Light Board
@@ -75,6 +81,7 @@ config SMDK2440_CPU2440
        bool "SMDK2440 with S3C2440 CPU module"
        depends on ARCH_S3C2440
        default y if ARCH_S3C2440
+       select S3C2440_XTAL_16934400
        select CPU_S3C2440
 
 config MACH_AT2440EVB