diff options
author | Jani Nikula <jani.nikula@intel.com> | 2021-04-08 10:22:14 +0300 |
---|---|---|
committer | Jani Nikula <jani.nikula@intel.com> | 2021-04-08 10:22:14 +0300 |
commit | d527353e4bceae6d59606ad21ad00916401d22ad (patch) | |
tree | 8ad569177aa89f15dcc485ee31d671cc98344ba8 /drivers/gpu/drm/ast/Makefile | |
parent | 70bfb30743d5da73058b0a2271e9c127a84fb494 (diff) | |
parent | 9c0fed84d5750e1eea6c664e073ffa2534a17743 (diff) |
Merge drm/drm-next into drm-intel-next
Sync up with topic/i915-gem-next and drm-intel-gt-next.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/ast/Makefile')
-rw-r--r-- | drivers/gpu/drm/ast/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/ast/Makefile b/drivers/gpu/drm/ast/Makefile index 2265a8a624dd..438a2d05b115 100644 --- a/drivers/gpu/drm/ast/Makefile +++ b/drivers/gpu/drm/ast/Makefile @@ -3,7 +3,6 @@ # Makefile for the drm device driver. This driver provides support for the # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. -ast-y := ast_cursor.o ast_drv.o ast_main.o ast_mm.o ast_mode.o ast_post.o \ - ast_dp501.o +ast-y := ast_drv.o ast_main.o ast_mm.o ast_mode.o ast_post.o ast_dp501.o obj-$(CONFIG_DRM_AST) := ast.o |