---

yaml --- r: 319215 b: refs/heads/master c: eac7a92 h: refs/heads/master i: 319213: f3f3e2e 319211: 3874e20 319207: db4139d 319199: 6278240 v: v3
git-mirror · Jul 23, 2012 · 67be61a · 67be61a
1 parent cb2ce11
commit 67be61a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1112fe88d4ebbb5f46750726b87fb0beb1396835
+refs/heads/master: eac7a92fd0bc5b1edff0f9c7be5dce4f88491fb3
diff --git a/trunk/drivers/mfd/Kconfig b/trunk/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/trunk/drivers/misc/Kconfig b/trunk/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/trunk/drivers/pwm/Kconfig b/trunk/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