---

yaml --- r: 319212 b: refs/heads/master c: 01bf32e h: refs/heads/master v: v3
git-mirror · Jul 23, 2012 · e524bf9 · e524bf9
1 parent 3874e20
commit e524bf9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 071407eefd708d7e273b67af150f8dff6c51eb58
+refs/heads/master: 01bf32e94968fd13804062859cfd935efebc11e9
diff --git a/trunk/drivers/pwm/Kconfig b/trunk/drivers/pwm/Kconfig
@@ -30,6 +30,7 @@ config PWM_IMX
 config PWM_MXS
 	tristate "Freescale MXS PWM support"
 	depends on ARCH_MXS && OF
+	select STMP_DEVICE
 	help
 	  Generic PWM framework driver for Freescale MXS.
 

diff --git a/trunk/drivers/pwm/pwm-mxs.c b/trunk/drivers/pwm/pwm-mxs.c
@@ -19,7 +19,7 @@
 #include <linux/platform_device.h>
 #include <linux/pwm.h>
 #include <linux/slab.h>
-#include <mach/common.h>
+#include <linux/stmp_device.h>
 
 #define SET	0x4
 #define CLR	0x8
@@ -163,7 +163,7 @@ static int mxs_pwm_probe(struct platform_device *pdev)
 	mxs->dev = &pdev->dev;
 	platform_set_drvdata(pdev, mxs);
 
-	mxs_reset_block(mxs->base);
+	stmp_reset_block(mxs->base);
 
 	return 0;