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

Include MSM DRM header conditionally

Mot-CRs-fixed: (CR)

Signed-off-by: Konstantin Makariev <hcv867@motorola.com>
Change-Id: I64e2a373dd09c23e1946eeff67070d7377875aa3
Reviewed-on: https://gerrit.mot.com/1220842
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Ryan Lattrel <ryanl@motorola.com>
Reviewed-by: Konstantin Makariev <kmakariev@motorola.com>
Submit-Approved: Jira Key
---
 .../input/touchscreen/synaptics_mmi/synaptics_dsx_i2c.c    | 1 -
 .../input/touchscreen/synaptics_mmi/synaptics_dsx_i2c.h    | 7 ++++---
 2 files changed, 4 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 37c542c33ecf..a98b8118a5bf 100644
--- a/drivers/input/touchscreen/synaptics_mmi/synaptics_dsx_i2c.c
+++ b/drivers/input/touchscreen/synaptics_mmi/synaptics_dsx_i2c.c
@@ -36,7 +36,6 @@
 #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 49e851e811e9..167796fd55ce 100644
--- a/drivers/input/touchscreen/synaptics_mmi/synaptics_dsx_i2c.h
+++ b/drivers/input/touchscreen/synaptics_mmi/synaptics_dsx_i2c.h
@@ -29,15 +29,16 @@
 #include <linux/ktime.h>
 #include <linux/semaphore.h>
 #include <linux/pm_qos.h>
+#include <linux/notifier.h>
+#include <linux/fb.h>
 #if defined(USB_CHARGER_DETECTION)
 #include <linux/usb.h>
 #include <linux/power_supply.h>
 #endif
 #if defined(CONFIG_MMI_PANEL_NOTIFICATIONS)
 #include <linux/mmi_panel_notifier.h>
-#elif defined(CONFIG_FB)
-#include <linux/notifier.h>
-#include <linux/fb.h>
+#elif defined(CONFIG_DRM)
+#include <linux/msm_drm_notify.h>
 #endif
 
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 38))