diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-04-09 14:33:47 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-04-09 14:33:47 +0200 |
| commit | 8cbf3202098f191f8b0a0606b2df0af047f21fe5 (patch) | |
| tree | 8e49e81e1879de78fcd6ac64041b9a72db06caec /drivers/gpu/drm/panel/Makefile | |
| parent | 04feced98a434c7046108671dc5b6f50f3b63ed7 (diff) | |
| parent | c39b06951f1dc2e384650288676c5b7dcc0ec92c (diff) | |
| download | op-kernel-dev-8cbf3202098f191f8b0a0606b2df0af047f21fe5.zip op-kernel-dev-8cbf3202098f191f8b0a0606b2df0af047f21fe5.tar.gz | |
Merge remote-tracking branch 'airlied/drm-next' into HEAD
Backmerge drm-next after the big s/crtc->fb/crtc->primary->fb/
cocinelle patch to avoid endless amounts of conflict hilarity in my
-next queue for 3.16.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/panel/Makefile')
| -rw-r--r-- | drivers/gpu/drm/panel/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/panel/Makefile b/drivers/gpu/drm/panel/Makefile index af9dfa2..8b92921 100644 --- a/drivers/gpu/drm/panel/Makefile +++ b/drivers/gpu/drm/panel/Makefile @@ -1 +1,3 @@ obj-$(CONFIG_DRM_PANEL_SIMPLE) += panel-simple.o +obj-$(CONFIG_DRM_PANEL_LD9040) += panel-ld9040.o +obj-$(CONFIG_DRM_PANEL_S6E8AA0) += panel-s6e8aa0.o |
