From e524bf902597ad3f9ac7b1a9313c8653789b60d8 Mon Sep 17 00:00:00 2001
From: Shawn Guo <shawn.guo@linaro.org>
Date: Tue, 26 Jun 2012 16:58:09 +0800
Subject: [PATCH] --- yaml --- r: 319212 b: refs/heads/master c:
 01bf32e94968fd13804062859cfd935efebc11e9 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/pwm/Kconfig   | 1 +
 trunk/drivers/pwm/pwm-mxs.c | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4273e0b3acec..f6ee414b2585 100644
--- 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
index 39bdebc0cb20..5227415f1855 100644
--- 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
index d9a38050a502..23e524bbee03 100644
--- 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;