From 8b65df3ad39fb94008491e60c87e262b65610932 Mon Sep 17 00:00:00 2001 From: Matt Parnell Date: Thu, 8 Oct 2009 17:20:59 -0500 Subject: [PATCH] drivers/drm: Make ati_pcigart and drm_sman only when needed and drm_debugfs only when DEBUG_FS=Y Signed-off-by: Matt Parnell --- drivers/gpu/drm/Makefile | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index d22e64b..71efdad 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -8,12 +8,14 @@ drm-y := drm_auth.o drm_bufs.o drm_cache.o \ drm_context.o drm_dma.o drm_drawable.o \ drm_drv.o drm_fops.o drm_gem.o drm_ioctl.o drm_irq.o \ drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \ - drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \ - drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.o \ + drm_agpsupport.o drm_scatter.o drm_pci.o \ + drm_sysfs.o drm_hashtab.o drm_mm.o \ drm_crtc.o drm_modes.o drm_edid.o \ - drm_info.o drm_debugfs.o drm_encoder_slave.o + drm_info.o drm_encoder_slave.o + drm-$(CONFIG_COMPAT) += drm_ioc32.o +obj-$(CONFIG_DEBUG_FS) += drm_debugfs.o drm_kms_helper-y := drm_fb_helper.o drm_crtc_helper.o @@ -22,14 +24,14 @@ obj-$(CONFIG_DRM_KMS_HELPER) += drm_kms_helper.o obj-$(CONFIG_DRM) += drm.o obj-$(CONFIG_DRM_TTM) += ttm/ obj-$(CONFIG_DRM_TDFX) += tdfx/ -obj-$(CONFIG_DRM_R128) += r128/ -obj-$(CONFIG_DRM_RADEON)+= radeon/ +obj-$(CONFIG_DRM_R128) += ati_pcigart.o r128/ +obj-$(CONFIG_DRM_RADEON)+= ati_pcigart.o radeon/ obj-$(CONFIG_DRM_MGA) += mga/ obj-$(CONFIG_DRM_I810) += i810/ obj-$(CONFIG_DRM_I830) += i830/ obj-$(CONFIG_DRM_I915) += i915/ -obj-$(CONFIG_DRM_SIS) += sis/ +obj-$(CONFIG_DRM_SIS) += drm_sman.o sis/ obj-$(CONFIG_DRM_SAVAGE)+= savage/ -obj-$(CONFIG_DRM_VIA) +=via/ -obj-$(CONFIG_DRM_NOUVEAU) +=nouveau/ +obj-$(CONFIG_DRM_VIA) += drm_sman.o via/ +obj-$(CONFIG_DRM_NOUVEAU) += nouveau/ obj-y += i2c/ -- 1.6.4.4