Merge branch 'for-3.6' of git://gitorious.org/linux-pwm/linux-pwm

[~andy/linux] / drivers / mfd / Kconfig

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 92144ed1ad469d8257eab6636c4d7f8cc4c65180..4fdc04ef37c2a7956285f5fa9e732b254ce7c68d 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -276,6 +276,7 @@ config TWL6030_PWM
        tristate "TWL6030 PWM (Pulse Width Modulator) Support"
        depends on TWL4030_CORE
        select HAVE_PWM
+       depends on !PWM
        default n
        help
          Say yes here if you want support for TWL6030 PWM.