From 67be61a02a5717afa6f6d181239ae2b136e94ca4 Mon Sep 17 00:00:00 2001
From: Thierry Reding <thierry.reding@avionic-design.de>
Date: Mon, 2 Jul 2012 21:29:45 +0200
Subject: [PATCH] --- yaml --- r: 319215 b: refs/heads/master c:
 eac7a92fd0bc5b1edff0f9c7be5dce4f88491fb3 h: refs/heads/master i:   319213:
 f3f3e2efa3b50b4f869b3fd841c0fdd3d04db29b   319211:
 3874e203248f5197e1260a918effaf4740e455c0   319207:
 db4139da2bdfd948ccbd0b4280c7a3b5952a1f31   319199:
 6278240e018489fe49c43fb44fdd116e5f42381d v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/mfd/Kconfig  | 1 +
 trunk/drivers/misc/Kconfig | 1 +
 trunk/drivers/pwm/Kconfig  | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f967779c66e3..7176660c371e 100644
--- 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
index e129c820df7d..19c7f3809963 100644
--- 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
index 2661f6e366f9..731ed8504a64 100644
--- 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
index 5227415f1855..0b2800fc1ca7 100644
--- 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