--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
-@@ -15,38 +15,38 @@ drm-y := drm_auth.o drm_buffer.o d
+@@ -15,39 +15,39 @@ drm-y := drm_auth.o drm_buffer.o d
drm_trace_points.o drm_global.o drm_prime.o
drm-$(CONFIG_COMPAT) += drm_ioc32.o
-drm-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_gem_cma_helper.o
+drm-$(CONFIG_COMPAT_DRM_GEM_CMA_HELPER) += drm_gem_cma_helper.o
+ drm-$(CONFIG_PCI) += ati_pcigart.o
drm-usb-y := drm_usb.o
+obj-$(CONFIG_COMPAT_DRM_CIRRUS_QEMU) += cirrus.o
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
-@@ -142,7 +142,7 @@ int drm_helper_probe_single_connector_mo
+@@ -152,7 +152,7 @@ int drm_helper_probe_single_connector_mo
goto prune;
}