diff options
| author | Sean Paul <seanpaul@chromium.org> | 2017-06-20 18:50:41 +0300 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2017-06-20 18:50:41 +0300 |
| commit | b15cdca5b5de52dc2262c41917e8727b96b30fb0 (patch) | |
| tree | f61c45517b1763e40ebc1d2fbed3af906281ead5 /drivers/gpu/drm/bridge/parade-ps8622.c | |
| parent | d4e0045c4ed300781d2d4cbab57d05ed5e665a37 (diff) | |
| parent | 8c52f36413063bedbb3d31a65048a61ea2f1e169 (diff) | |
| download | linux-b15cdca5b5de52dc2262c41917e8727b96b30fb0.tar.xz | |
Merge remote-tracking branch 'airlied/drm-next' into drm-misc-next-fixes
Backmerging airlied/drm-next
Diffstat (limited to 'drivers/gpu/drm/bridge/parade-ps8622.c')
| -rw-r--r-- | drivers/gpu/drm/bridge/parade-ps8622.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/gpu/drm/bridge/parade-ps8622.c b/drivers/gpu/drm/bridge/parade-ps8622.c index 1dcec3b97e67..6f22f9fec9bf 100644 --- a/drivers/gpu/drm/bridge/parade-ps8622.c +++ b/drivers/gpu/drm/bridge/parade-ps8622.c @@ -24,14 +24,12 @@ #include <linux/of_device.h> #include <linux/pm.h> #include <linux/regulator/consumer.h> - +#include <drm/drm_atomic_helper.h> +#include <drm/drm_crtc.h> +#include <drm/drm_crtc_helper.h> #include <drm/drm_of.h> #include <drm/drm_panel.h> - -#include "drmP.h" -#include "drm_crtc.h" -#include "drm_crtc_helper.h" -#include "drm_atomic_helper.h" +#include <drm/drmP.h> /* Brightness scale on the Parade chip */ #define PS8622_MAX_BRIGHTNESS 0xff |