Merge git://git.infradead.org/iommu-2.6

[karo-tx-linux.git] / arch / arm / plat-samsung / Kconfig

diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
index 32be05cf82a32db3bb5062fdbdbec2403b656087..be72100b81b4b86fceb6d9699256f577790126ac 100644 (file)
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@ -273,6 +273,19 @@ config SAMSUNG_DEV_KEYPAD
        help
          Compile in platform device definitions for keypad
 
+config SAMSUNG_DEV_PWM
+       bool
+       default y if ARCH_S3C2410
+       help
+         Compile in platform device definition for PWM Timer
+
+config S3C24XX_PWM
+       bool "PWM device support"
+       select HAVE_PWM
+       help
+         Support for exporting the PWM timer blocks via the pwm device
+         system
+
 # DMA
 
 config S3C_DMA