Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

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

diff --git a/arch/arm/mach-s5p64x0/Kconfig b/arch/arm/mach-s5p64x0/Kconfig
index 164d2783d3818da2e5f90ccfe8af769df3ee8db1..017af4c4293c763757cd780aa63758682e3e6c88 100644 (file)
--- a/arch/arm/mach-s5p64x0/Kconfig
+++ b/arch/arm/mach-s5p64x0/Kconfig
@@ -10,12 +10,14 @@ if ARCH_S5P64X0
 config CPU_S5P6440
        bool
        select S3C_PL330_DMA
+       select S5P_HRT
        help
          Enable S5P6440 CPU support
 
 config CPU_S5P6450
        bool
        select S3C_PL330_DMA
+       select S5P_HRT
        help
          Enable S5P6450 CPU support
 
@@ -34,6 +36,7 @@ config MACH_SMDK6440
        select S3C_DEV_WDT
        select S3C64XX_DEV_SPI
        select SAMSUNG_DEV_ADC
+       select SAMSUNG_DEV_PWM
        select SAMSUNG_DEV_TS
        select S5P64X0_SETUP_I2C1
        help
@@ -47,6 +50,7 @@ config MACH_SMDK6450
        select S3C_DEV_WDT
        select S3C64XX_DEV_SPI
        select SAMSUNG_DEV_ADC
+       select SAMSUNG_DEV_PWM
        select SAMSUNG_DEV_TS
        select S5P64X0_SETUP_I2C1
        help