ANDROID: fix up merge issues in drm_mipi_dsi.h

0e9cdc9863 ("Revert "ANDROID: include: drm: support unicasting mipi
cmds to dsi ctrls"") left an out-of-tree difference, so fix that up.

Reported-by: Matthias Maennich <maennich@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I27ae5707b35bb25ec3ff5c55ab07fb712c496642
This commit is contained in:
Greg Kroah-Hartman 2021-01-22 16:31:08 +01:00 committed by Alistair Delva
parent dcddd3a0bb
commit 52eaf83d7b

View File

@ -19,6 +19,7 @@ struct drm_dsc_picture_parameter_set;
#define MIPI_DSI_MSG_REQ_ACK BIT(0)
/* use Low Power Mode to transmit message */
#define MIPI_DSI_MSG_USE_LPM BIT(1)
/* Stack all commands until lastcommand bit and trigger all in one go */
#define MIPI_DSI_MSG_LASTCOMMAND BIT(3)
/**