diff options
| author | Thierry Reding <thierry.reding@avionic-design.de> | 2012-07-02 23:29:45 +0400 |
|---|---|---|
| committer | Thierry Reding <thierry.reding@avionic-design.de> | 2012-07-23 15:23:56 +0400 |
| commit | eac7a92fd0bc5b1edff0f9c7be5dce4f88491fb3 (patch) | |
| tree | c924a08d43f180aad4e384a25978da9664ce97f1 /drivers | |
| parent | 1112fe88d4ebbb5f46750726b87fb0beb1396835 (diff) | |
| download | linux-eac7a92fd0bc5b1edff0f9c7be5dce4f88491fb3.tar.xz | |
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')
| -rw-r--r-- | drivers/mfd/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/misc/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/pwm/Kconfig | 1 |
3 files changed, 3 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. diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 2661f6e366f9..731ed8504a64 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -64,6 +64,7 @@ config AB8500_PWM bool "AB8500 PWM support" depends on AB8500_CORE && ARCH_U8500 select HAVE_PWM + depends on !PWM help This driver exports functions to enable/disble/config/free Pulse Width Modulation in the Analog Baseband Chip AB8500. diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig index 5227415f1855..0b2800fc1ca7 100644 --- 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 |