aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>2010-07-14 15:03:49 +0200
committerJohn Rigby <john.rigby@linaro.org>2010-09-02 22:45:51 -0600
commitee87924d8ff4daa6f07b5af8ebef9e21b75ab713 (patch)
tree8655cade8280c768666b444e4fc594d639e1be96
parent68b665b4be247cfe342ca7940173e357b72961c7 (diff)
downloadlinux-2.6.34-ux500-ee87924d8ff4daa6f07b5af8ebef9e21b75ab713.tar.gz
fix build errors in sim5500_defconfig with kernel v2.6.34
Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> Change-Id: Idb601a89a4051cf21fd51f6f4bba93532b63c301 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/2867 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
-rw-r--r--arch/arm/mach-ux500/mloader_helper.c1
-rw-r--r--arch/arm/mach-ux500/pwm.c1
-rwxr-xr-xarch/arm/mach-ux500/timer.c2
3 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/mloader_helper.c b/arch/arm/mach-ux500/mloader_helper.c
index f429142712f..4d5816f9ab3 100644
--- a/arch/arm/mach-ux500/mloader_helper.c
+++ b/arch/arm/mach-ux500/mloader_helper.c
@@ -10,6 +10,7 @@
#include <linux/workqueue.h>
#include <linux/platform_device.h>
#include <linux/sysfs.h>
+#include <linux/slab.h>
static ssize_t mloader_sysfs_addr(struct device *dev,
struct device_attribute *attr,
diff --git a/arch/arm/mach-ux500/pwm.c b/arch/arm/mach-ux500/pwm.c
index b0dd2da3397..37f6bd481c5 100644
--- a/arch/arm/mach-ux500/pwm.c
+++ b/arch/arm/mach-ux500/pwm.c
@@ -17,6 +17,7 @@
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/pwm.h>
+#include <linux/slab.h>
/* Register offsets */
#define PWM_CONTROL_REG_OFFSET 0x00
diff --git a/arch/arm/mach-ux500/timer.c b/arch/arm/mach-ux500/timer.c
index d5f27a6fae0..b8424e3ef1c 100755
--- a/arch/arm/mach-ux500/timer.c
+++ b/arch/arm/mach-ux500/timer.c
@@ -177,8 +177,10 @@ static void __init u8500_timer_init(void)
/* Init the timer and register clocksource */
u8500_timer_reset();
+#ifdef CONFIG_UX500_SOC_DB8500
/* register db8500-prcmu timer as always-on clock source */
db8500_prcm_timer_init();
+#endif
u8500_clksrc.mult = clocksource_hz2mult(rate, u8500_clksrc.shift);
bits = 8*sizeof(u8500_count);