4 files changed, 8 insertions, 8 deletions
diff --git a/drivers/video/fbdev/msm/mdss_qpic.c b/drivers/video/fbdev/msm/mdss_qpic.c
index 57f5af4c7086..5a953be13316 100644
--- a/drivers/video/fbdev/msm/mdss_qpic.c
+++ b/drivers/video/fbdev/msm/mdss_qpic.c
@@ -30,7 +30,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/clk/msm-clk.h>
 
-#include <mach/sps.h>
+#include <linux/msm-sps.h>
 #include <mach/hardware.h>
 
 #include "mdss_fb.h"
@@ -201,7 +201,7 @@ int qpic_init_sps(struct platform_device *pdev,
 	struct sps_connect *sps_config = &end_point->config;
 	struct sps_register_event *sps_event = &end_point->bam_event;
 	struct sps_bam_props bam = {0};
-	u32 bam_handle = 0;
+	unsigned long bam_handle = 0;
 
 	if (qpic_res->sps_init)
 		return 0;
diff --git a/drivers/video/fbdev/msm/mdss_qpic.h b/drivers/video/fbdev/msm/mdss_qpic.h
index 086e8c88797f..48d26e94ea93 100644
--- a/drivers/video/fbdev/msm/mdss_qpic.h
+++ b/drivers/video/fbdev/msm/mdss_qpic.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2014, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -16,7 +16,7 @@
 
 #include <linux/list.h>
 #include <mach/scm-io.h>
-#include <mach/sps.h>
+#include <linux/msm-sps.h>
 
 #include "mdss_panel.h"
 
diff --git a/drivers/video/fbdev/msm/mdss_qpic_panel.c b/drivers/video/fbdev/msm/mdss_qpic_panel.c
index c9046ab23d54..518ced8acae0 100644
--- a/drivers/video/fbdev/msm/mdss_qpic_panel.c
+++ b/drivers/video/fbdev/msm/mdss_qpic_panel.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2014, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -23,7 +23,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/uaccess.h>
 
-#include <mach/sps.h>
+#include <linux/msm-sps.h>
 
 #include "mdss.h"
 #include "mdss_panel.h"
diff --git a/drivers/video/fbdev/msm/mdss_qpic_panel.h b/drivers/video/fbdev/msm/mdss_qpic_panel.h
index 76f7dc21ed2b..0b24ad89ba4f 100644
--- a/drivers/video/fbdev/msm/mdss_qpic_panel.h
+++ b/drivers/video/fbdev/msm/mdss_qpic_panel.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2014, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -15,7 +15,7 @@
 #define MDSS_QPIC_PANEL_H
 
 #include <linux/list.h>
-#include <mach/sps.h>
+#include <linux/msm-sps.h>
 
 #include "mdss_panel.h"