---

yaml --- r: 319206 b: refs/heads/master c: 215c29d h: refs/heads/master v: v3
git-mirror · Jul 2, 2012 · a3b7c75 · a3b7c75
1 parent 09400cd
commit a3b7c75
Show file tree

Hide file tree

Showing 5 changed files with 99 additions and 147 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29693248edf10830db2ef82b36806e378ff75c67
+refs/heads/master: 215c29d3d0e925189ade522d1ea6052a320d7692
diff --git a/trunk/arch/arm/plat-samsung/Makefile b/trunk/arch/arm/plat-samsung/Makefile
@@ -63,7 +63,3 @@ obj-$(CONFIG_S5P_SLEEP)		+= s5p-sleep.o
 # PD support
 
 obj-$(CONFIG_SAMSUNG_PD)	+= pd.o
-
-# PWM support
-
-obj-$(CONFIG_HAVE_PWM)		+= pwm.o
diff --git a/trunk/drivers/pwm/Kconfig b/trunk/drivers/pwm/Kconfig
@@ -36,6 +36,15 @@ config PWM_PXA
 	  To compile this driver as a module, choose M here: the module
 	  will be called pwm-pxa.
 
+config PWM_SAMSUNG
+	tristate "Samsung pwm support"
+	depends on PLAT_SAMSUNG
+	help
+	  Generic PWM framework driver for Samsung.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called pwm-samsung.
+
 config PWM_TEGRA
 	tristate "NVIDIA Tegra PWM support"
 	depends on ARCH_TEGRA

diff --git a/trunk/drivers/pwm/Makefile b/trunk/drivers/pwm/Makefile
@@ -2,4 +2,5 @@ obj-$(CONFIG_PWM)		+= core.o
 obj-$(CONFIG_PWM_BFIN)		+= pwm-bfin.o
 obj-$(CONFIG_PWM_IMX)		+= pwm-imx.o
 obj-$(CONFIG_PWM_PXA)		+= pwm-pxa.o
+obj-$(CONFIG_PWM_SAMSUNG)	+= pwm-samsung.o
 obj-$(CONFIG_PWM_TEGRA)		+= pwm-tegra.o