From 47f462d36aab2528850ecc31b954b469cb3dff71 Mon Sep 17 00:00:00 2001
From: Konstantin Makariev <hcv867@motorola.com>
Date: Fri, 3 Aug 2018 12:01:34 -0500
Subject: [PATCH] Revert "fixup! (CR) synaptics_mmi: DSI bound suspend/resume"

Reverting commit, since it's impeding compilation

Mot-CRs-fixed: (CR)

This reverts commit 6b155d0caca7970dcb3746dbc43eed4342803036.

Change-Id: If71394f0cda3f0a6ca6180f551ff8b54ed5b27f6
Reviewed-on: https://gerrit.mot.com/1220829
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Reviewed-by: Konstantin Makariev <kmakariev@motorola.com>
Tested-by: Jira Key
Submit-Approved: Jira Key
---
 drivers/input/touchscreen/synaptics_mmi/synaptics_dsx_i2c.c | 1 +
 drivers/input/touchscreen/synaptics_mmi/synaptics_dsx_i2c.h | 5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/input/touchscreen/synaptics_mmi/synaptics_dsx_i2c.c b/drivers/input/touchscreen/synaptics_mmi/synaptics_dsx_i2c.c
index a98b8118a5bf..37c542c33ecf 100644
--- a/drivers/input/touchscreen/synaptics_mmi/synaptics_dsx_i2c.c
+++ b/drivers/input/touchscreen/synaptics_mmi/synaptics_dsx_i2c.c
@@ -36,6 +36,7 @@
 #include <linux/pinctrl/consumer.h>
 #include <linux/input/mt.h>
 #include <linux/input/synaptics_dsx_mmi.h>
+#include <linux/msm_drm_notify.h>
 
 #include "synaptics_dsx_i2c.h"
 #include "synaptics_dsx_dropbox.h"
diff --git a/drivers/input/touchscreen/synaptics_mmi/synaptics_dsx_i2c.h b/drivers/input/touchscreen/synaptics_mmi/synaptics_dsx_i2c.h
index 2797ebd92e56..49e851e811e9 100644
--- a/drivers/input/touchscreen/synaptics_mmi/synaptics_dsx_i2c.h
+++ b/drivers/input/touchscreen/synaptics_mmi/synaptics_dsx_i2c.h
@@ -35,9 +35,6 @@
 #endif
 #if defined(CONFIG_MMI_PANEL_NOTIFICATIONS)
 #include <linux/mmi_panel_notifier.h>
-#elif defined(CONFIG_DRM)
-#include <linux/notifier.h>
-#include <linux/msm_drm_notify.h>
 #elif defined(CONFIG_FB)
 #include <linux/notifier.h>
 #include <linux/fb.h>
@@ -477,7 +474,7 @@ struct synaptics_rmi4_data {
 	struct mutex state_mutex;
 #if defined(CONFIG_MMI_PANEL_NOTIFICATIONS)
 	struct mmi_notifier panel_nb;
-#elif (defined(CONFIG_FB) || defined(CONFIG_DRM))
+#elif defined(CONFIG_FB)
 	struct notifier_block panel_nb;
 #endif
 	atomic_t panel_off_flag;