Merge branch 'for-3.6/core' of git://git.kernel.dk/linux-block

[deliverable/linux.git] / drivers / pwm / Kconfig

diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
index 5227415f18554addbe36892a2b13595608df8ced..8fc3808d7a3e8b08b2bc3a8eb53b899f9a41b953 100644 (file)
--- a/drivers/pwm/Kconfig
+++ b/drivers/pwm/Kconfig
@@ -1,5 +1,6 @@
 menuconfig PWM
        bool "PWM Support"
+       depends on !MACH_JZ4740 && !PUV3_PWM
        help
          This enables PWM support through the generic PWM framework.
          You only need to enable this, if you also want to enable
@@ -27,6 +28,16 @@ config PWM_IMX
          To compile this driver as a module, choose M here: the module
          will be called pwm-imx.
 
+config PWM_LPC32XX
+       tristate "LPC32XX PWM support"
+       depends on ARCH_LPC32XX
+       help
+         Generic PWM framework driver for LPC32XX. The LPC32XX SOC has two
+         PWM controllers.
+
+         To compile this driver as a module, choose M here: the module
+         will be called pwm-lpc32xx.
+
 config PWM_MXS
        tristate "Freescale MXS PWM support"
        depends on ARCH_MXS && OF
@@ -65,6 +76,26 @@ config PWM_TEGRA
          To compile this driver as a module, choose M here: the module
          will be called pwm-tegra.
 
+config  PWM_TIECAP
+       tristate "ECAP PWM support"
+       depends on SOC_AM33XX
+       help
+         PWM driver support for the ECAP APWM controller found on AM33XX
+         TI SOC
+
+         To compile this driver as a module, choose M here: the module
+         will be called pwm-tiecap.
+
+config  PWM_TIEHRPWM
+       tristate "EHRPWM PWM support"
+       depends on SOC_AM33XX
+       help
+         PWM driver support for the EHRPWM controller found on AM33XX
+         TI SOC
+
+         To compile this driver as a module, choose M here: the module
+         will be called pwm-tiehrpwm.
+
 config PWM_VT8500
        tristate "vt8500 pwm support"
        depends on ARCH_VT8500