summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/pwm/Kconfig1
-rw-r--r--drivers/pwm/pwm-mxs.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
index 39bdebc0cb20..5227415f1855 100644
--- a/drivers/pwm/Kconfig
+++ b/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/drivers/pwm/pwm-mxs.c b/drivers/pwm/pwm-mxs.c
index d9a38050a502..23e524bbee03 100644
--- a/drivers/pwm/pwm-mxs.c
+++ b/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;