diff options
author | Jens Axboe <axboe@kernel.dk> | 2018-12-09 17:45:40 -0700 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2018-12-09 17:45:40 -0700 |
commit | 96f774106ed48808a5e314741e3414c617d14460 (patch) | |
tree | a0beee162eeaf4813495ee28d3cfdd06effbc8be /drivers/gpu/drm/omapdrm/dss/omapdss.h | |
parent | 58ab5e32e6fd83e33943614e7257f2ac5823824a (diff) | |
parent | 40e020c129cfc991e8ab4736d2665351ffd1468d (diff) | |
download | linux-96f774106ed48808a5e314741e3414c617d14460.tar.bz2 |
Merge tag 'v4.20-rc6' into for-4.21/block
Pull in v4.20-rc6 to resolve the conflict in NVMe, but also to get the
two corruption fixes. We're going to be overhauling the direct dispatch
path, and we need to do that on top of the changes we made for that
in mainline.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/gpu/drm/omapdrm/dss/omapdss.h')
-rw-r--r-- | drivers/gpu/drm/omapdrm/dss/omapdss.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h index 1f698a95a94a..33e15cb77efa 100644 --- a/drivers/gpu/drm/omapdrm/dss/omapdss.h +++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h @@ -432,7 +432,7 @@ struct omap_dss_device { const struct omap_dss_driver *driver; const struct omap_dss_device_ops *ops; unsigned long ops_flags; - unsigned long bus_flags; + u32 bus_flags; /* helper variable for driver suspend/resume */ bool activate_after_resume; |