Commit 52eaf83d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Alistair Delva
Browse files

ANDROID: fix up merge issues in drm_mipi_dsi.h 



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

Reported-by: default avatarMatthias Maennich <maennich@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I27ae5707b35bb25ec3ff5c55ab07fb712c496642
parent dcddd3a0
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment