summaryrefslogtreecommitdiff
path: root/drivers/gpu/msm/adreno.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/msm/adreno.c')
-rw-r--r--drivers/gpu/msm/adreno.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/msm/adreno.c b/drivers/gpu/msm/adreno.c
index 5bac1f2d79e0..b74e3b54f331 100644
--- a/drivers/gpu/msm/adreno.c
+++ b/drivers/gpu/msm/adreno.c
@@ -16,7 +16,6 @@
#include <linux/of.h>
#include <linux/of_device.h>
#include <linux/delay.h>
-#include <linux/of_coresight.h>
#include <linux/input.h>
#include <soc/qcom/scm.h>
@@ -1001,7 +1000,7 @@ static int adreno_of_get_power(struct adreno_device *adreno_dev,
return 0;
}
-#ifdef CONFIG_MSM_OCMEM
+#ifdef CONFIG_QCOM_OCMEM
static int
adreno_ocmem_malloc(struct adreno_device *adreno_dev)
{
@@ -1112,7 +1111,7 @@ static int adreno_probe(struct platform_device *pdev)
adreno_sysfs_init(device);
- kgsl_pwrscale_init(&pdev->dev, CONFIG_MSM_ADRENO_DEFAULT_GOVERNOR);
+ kgsl_pwrscale_init(&pdev->dev, CONFIG_QCOM_ADRENO_DEFAULT_GOVERNOR);
adreno_input_handler.private = device;