Merge tag 'for-3.7-rc1' of git://gitorious.org/linux-pwm/linux-pwm

[mirror_ubuntu-zesty-kernel.git] / drivers / pwm / Kconfig

diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
index d7c6b83097c1d3e856c8a0da50bdb8c4b6726fcd..ed81720e7b2bf4e7cd24f19f84c382e0ba7b669b 100644 (file)
--- a/drivers/pwm/Kconfig
+++ b/drivers/pwm/Kconfig
@@ -1,6 +1,5 @@
 menuconfig PWM
        bool "Pulse-Width Modulation (PWM) Support"
-       depends on !MACH_JZ4740 && !PUV3_PWM
        help
          Generic Pulse-Width Modulation (PWM) support.
 
@@ -29,6 +28,15 @@ menuconfig PWM
 
 if PWM
 
+config PWM_AB8500
+       tristate "AB8500 PWM support"
+       depends on AB8500_CORE && ARCH_U8500
+       help
+         Generic PWM framework driver for Analog Baseband AB8500.
+
+         To compile this driver as a module, choose M here: the module
+         will be called pwm-ab8500.
+
 config PWM_BFIN
        tristate "Blackfin PWM support"
        depends on BFIN_GPTIMERS
@@ -47,6 +55,16 @@ config PWM_IMX
          To compile this driver as a module, choose M here: the module
          will be called pwm-imx.
 
+config PWM_JZ4740
+       tristate "Ingenic JZ4740 PWM support"
+       depends on MACH_JZ4740
+       help
+         Generic PWM framework driver for Ingenic JZ4740 based
+         machines.
+
+         To compile this driver as a module, choose M here: the module
+         will be called pwm-jz4740.
+
 config PWM_LPC32XX
        tristate "LPC32XX PWM support"
        depends on ARCH_LPC32XX
@@ -67,6 +85,15 @@ config PWM_MXS
          To compile this driver as a module, choose M here: the module
          will be called pwm-mxs.
 
+config PWM_PUV3
+       tristate "PKUnity NetBook-0916 PWM support"
+       depends on ARCH_PUV3
+       help
+         Generic PWM framework driver for PKUnity NetBook-0916.
+
+         To compile this driver as a module, choose M here: the module
+         will be called pwm-puv3.
+
 config PWM_PXA
        tristate "PXA PWM support"
        depends on ARCH_PXA