Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[pandora-kernel.git] / arch / arm / mach-s3c64xx / Kconfig

diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig
index 579d2f0..e4177e2 100644 (file)
--- a/arch/arm/mach-s3c64xx/Kconfig
+++ b/arch/arm/mach-s3c64xx/Kconfig
@@ -143,6 +143,7 @@ config MACH_SMDK6410
        select S3C_DEV_USB_HSOTG
        select S3C_DEV_WDT
        select SAMSUNG_DEV_KEYPAD
+       select SAMSUNG_DEV_PWM
        select HAVE_S3C2410_WATCHDOG if WATCHDOG
        select S3C64XX_SETUP_SDHCI
        select S3C64XX_SETUP_I2C1
@@ -231,7 +232,7 @@ config MACH_HMT
        select S3C_DEV_NAND
        select S3C_DEV_USB_HOST
        select S3C64XX_SETUP_FB_24BPP
-       select HAVE_PWM
+       select SAMSUNG_DEV_PWM
        help
          Machine support for the Airgoo HMT
 
@@ -249,8 +250,8 @@ config MACH_SMARTQ
        select S3C64XX_SETUP_SDHCI
        select S3C64XX_SETUP_FB_24BPP
        select SAMSUNG_DEV_ADC
+       select SAMSUNG_DEV_PWM
        select SAMSUNG_DEV_TS
-       select HAVE_PWM
        help
            Shared machine support for SmartQ 5/7