diff options
author | Thomas Zimmermann <tzimmermann@suse.de> | 2024-05-02 11:25:27 +0200 |
---|---|---|
committer | Thomas Zimmermann <tzimmermann@suse.de> | 2024-05-02 11:25:27 +0200 |
commit | b0a835db17434473dfb84f7646de1cedc4ecdb94 (patch) | |
tree | 5ca9891b58895b99555ec7717129eb22cb3c0a19 /drivers/gpu/drm/gma500/Makefile | |
parent | e91a36b472862a1d199ea8d1b1ca192a347bf33e (diff) | |
parent | 4a56c0ed5aa0bcbe1f5f7d755fb1fe1ebf48ae9c (diff) |
Merge drm/drm-next into drm-misc-next
Backmerging to get DRM fixes from v6.9-rc6.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'drivers/gpu/drm/gma500/Makefile')
-rw-r--r-- | drivers/gpu/drm/gma500/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/gma500/Makefile b/drivers/gpu/drm/gma500/Makefile index 4f302cd5e1a6..58fed80c7392 100644 --- a/drivers/gpu/drm/gma500/Makefile +++ b/drivers/gpu/drm/gma500/Makefile @@ -34,7 +34,6 @@ gma500_gfx-y += \ psb_intel_lvds.o \ psb_intel_modes.o \ psb_intel_sdvo.o \ - psb_lid.o \ psb_irq.o gma500_gfx-$(CONFIG_ACPI) += opregion.o |