---

yaml --- r: 347125 b: refs/heads/master c: 6179a58 h: refs/heads/master i: 347123: a4c9541 v: v3
git-mirror · Nov 28, 2012 · ea49703 · ea49703
1 parent 6b753fa
commit ea49703
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 195 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa7656471df6cad1a4ed82ba888a40e9bc46aa19
+refs/heads/master: 6179a58ec7e26dad1bc262762e322dffb875152b
diff --git a/trunk/drivers/pwm/Kconfig b/trunk/drivers/pwm/Kconfig
@@ -164,15 +164,6 @@ config  PWM_TIPWMSS
 	  PWM submodules require PWM config space access from submodule
 	  drivers and require common parent driver support.
 
-config PWM_TWL6030
-	tristate "TWL6030 PWM support"
-	depends on TWL4030_CORE
-	help
-	  Generic PWM framework driver for TWL6030.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called pwm-twl6030.
-
 config PWM_TWL
 	tristate "TWL4030/6030 PWM support"
 	depends on TWL4030_CORE

diff --git a/trunk/drivers/pwm/Makefile b/trunk/drivers/pwm/Makefile
@@ -13,7 +13,6 @@ obj-$(CONFIG_PWM_TEGRA)		+= pwm-tegra.o
 obj-$(CONFIG_PWM_TIECAP)	+= pwm-tiecap.o
 obj-$(CONFIG_PWM_TIEHRPWM)	+= pwm-tiehrpwm.o
 obj-$(CONFIG_PWM_TIPWMSS)	+= pwm-tipwmss.o
-obj-$(CONFIG_PWM_TWL6030)	+= pwm-twl6030.o
 obj-$(CONFIG_PWM_TWL)		+= pwm-twl.o
 obj-$(CONFIG_PWM_TWL_LED)	+= pwm-twl-led.o
 obj-$(CONFIG_PWM_VT8500)	+= pwm-vt8500.o
diff --git a/trunk/drivers/pwm/pwm-twl6030.c b/trunk/drivers/pwm/pwm-twl6030.c