This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/drivers/gpu/ion/ion_heap.c b/drivers/gpu/ion/ion_heap.c | |
index fe878fe..0b193a0 100644 | |
--- a/drivers/gpu/ion/ion_heap.c | |
+++ b/drivers/gpu/ion/ion_heap.c | |
@@ -229,43 +229,6 @@ int ion_heap_buffer_zero(struct ion_buffer *buffer) | |
return ret; | |
} | |
-int ion_heap_buffer_zero_old(struct ion_buffer *buffer) | |
-{ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/drivers/gpu/ion/ion_page_pool.c b/drivers/gpu/ion/ion_page_pool.c | |
index 9e7d0c2..a1845de 100644 | |
--- a/drivers/gpu/ion/ion_page_pool.c | |
+++ b/drivers/gpu/ion/ion_page_pool.c | |
@@ -22,7 +22,6 @@ | |
#include <linux/module.h> | |
#include <linux/slab.h> | |
#include <linux/vmalloc.h> | |
-#include <linux/swap.h> | |
#include "ion_priv.h" |
This file has been truncated, but you can view the full file.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/drivers/video/msm/Kconfig b/drivers/video/msm/Kconfig | |
index 981f845..01edf92 100644 | |
--- a/drivers/video/msm/Kconfig | |
+++ b/drivers/video/msm/Kconfig | |
@@ -1,997 +1,37 @@ | |
- | |
-source "drivers/video/msm/vidc/Kconfig" | |
- | |
-config FB_MSM | |
- tristate "MSM Framebuffer support" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/drivers/video/msm/mdss/Kconfig b/drivers/video/msm/mdss/Kconfig | |
index ebc014a..01edf92 100644 | |
--- a/drivers/video/msm/mdss/Kconfig | |
+++ b/drivers/video/msm/mdss/Kconfig | |
@@ -35,7 +35,3 @@ config FB_MSM_MDSS_MDP3 | |
---help--- | |
The MDP3 provides support for an older version display controller | |
included in latest display sub-system, known as MDSS. | |
- | |
-config LGE_MIPI_DSI_LGD_NT35521_WXGA |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/drivers/video/msm/mdss/Kconfig b/drivers/video/msm/mdss/Kconfig | |
index ebc014a..01edf92 100644 | |
--- a/drivers/video/msm/mdss/Kconfig | |
+++ b/drivers/video/msm/mdss/Kconfig | |
@@ -35,7 +35,3 @@ config FB_MSM_MDSS_MDP3 | |
---help--- | |
The MDP3 provides support for an older version display controller | |
included in latest display sub-system, known as MDSS. | |
- | |
-config LGE_MIPI_DSI_LGD_NT35521_WXGA |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/drivers/video/msm/mdss/dsi_host_v2.c b/drivers/video/msm/mdss/dsi_host_v2.c | |
index f6d97f7..68c991c 100644 | |
--- a/drivers/video/msm/mdss/dsi_host_v2.c | |
+++ b/drivers/video/msm/mdss/dsi_host_v2.c | |
@@ -26,6 +26,7 @@ | |
#include "dsi_io_v2.h" | |
#include "dsi_host_v2.h" | |
#include "mdss_debug.h" | |
+#include "mdp3.h" | |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/drivers/video/msm/mdss/dsi_host_v2.c b/drivers/video/msm/mdss/dsi_host_v2.c | |
index f78090a..68c991c 100644 | |
--- a/drivers/video/msm/mdss/dsi_host_v2.c | |
+++ b/drivers/video/msm/mdss/dsi_host_v2.c | |
@@ -1329,7 +1329,83 @@ static int msm_dsi_cont_on(struct mdss_panel_data *pdata) | |
return 0; | |
} | |
-int msm_dsi_bta_status_check(struct mdss_dsi_ctrl_pdata *ctrl_pdata) | |
+static int msm_dsi_read_status(struct mdss_dsi_ctrl_pdata *ctrl) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/drivers/video/msm/mdss/mdss_dsi.c b/drivers/video/msm/mdss/mdss_dsi.c | |
index e54adc4..ee8994a 100644 | |
--- a/drivers/video/msm/mdss/mdss_dsi.c | |
+++ b/drivers/video/msm/mdss/mdss_dsi.c | |
@@ -1,4 +1,4 @@ | |
-/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved. | |
+/* Copyright (c) 2012-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 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/drivers/video/msm/mdss/mdss_dsi.c b/drivers/video/msm/mdss/mdss_dsi.c | |
index e54adc4..ee8994a 100644 | |
--- a/drivers/video/msm/mdss/mdss_dsi.c | |
+++ b/drivers/video/msm/mdss/mdss_dsi.c | |
@@ -1,4 +1,4 @@ | |
-/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved. | |
+/* Copyright (c) 2012-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 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/arch/arm/boot/dts/msm8926.dtsi b/arch/arm/boot/dts/msm8926.dtsi | |
index 1919022..a3b0780 100644 | |
--- a/arch/arm/boot/dts/msm8926.dtsi | |
+++ b/arch/arm/boot/dts/msm8926.dtsi | |
@@ -1,4 +1,4 @@ | |
-/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved. | |
+/* Copyright (c) 2013, 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 |