compat-drivers: make patches apply again
authorHauke Mehrtens <hauke@hauke-m.de>
Thu, 29 Nov 2012 15:26:15 +0000 (16:26 +0100)
committerLuis R. Rodriguez <mcgrof@do-not-panic.com>
Thu, 29 Nov 2012 21:33:19 +0000 (13:33 -0800)
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
patches/drm/06-rename-config-options.patch

index 9ca7ed991100d24b03288b77b16b188cc60d2f48..9ad2f89b4220af9892fcb0489b15c5b390d6f7e4 100644 (file)
@@ -1,11 +1,12 @@
 --- 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
  
@@ -84,7 +85,7 @@
 +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;
        }