summaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorThierry Reding <thierry.reding@avionic-design.de>2012-07-02 21:29:45 +0200
committerThierry Reding <thierry.reding@avionic-design.de>2012-07-23 13:23:56 +0200
commiteac7a92fd0bc5b1edff0f9c7be5dce4f88491fb3 (patch)
treec924a08d43f180aad4e384a25978da9664ce97f1 /drivers/mfd
parent1112fe88d4ebbb5f46750726b87fb0beb1396835 (diff)
downloadlinux-eac7a92fd0bc5b1edff0f9c7be5dce4f88491fb3.tar.bz2
pwm: Conflict with legacy PWM API
In order to avoid duplicate symbols with legacy PWM API implementations, the new PWM framework needs to conflict with any of the existing legacy implementations. This is done in two ways: for implementations provided by drivers, a conflict is added to the driver to ensure it will have to be ported to the PWM subsystem before it can coexist with other PWM providers. For architecture-specific code, the conflict is added to the PWM symbol to avoid confusion when a previously picked platform or machine can no longer be selected because of the PWM subsystem being included. Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index e129c820df7d..19c7f3809963 100644
--- 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.