diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-03-20 15:38:05 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-03-20 15:38:05 +1100 |
commit | debd9c0359e33f23ef54533d370b03516d54d4a5 (patch) | |
tree | 268bc28ce02382c58aa6a14b0f1012c839696ca7 /drivers/gpu/drm/Makefile | |
parent | c2ced7afe298f12721337baee6b10cbc56da5c8b (diff) | |
parent | 5e2d7851a34c18f03ed2fd1c0784a54dca44460c (diff) |
Merge branch 'quilt/staging'
Conflicts:
drivers/gpu/drm/Makefile
Diffstat (limited to 'drivers/gpu/drm/Makefile')
-rw-r--r-- | drivers/gpu/drm/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index 4ec5061fa584..41c409bfa653 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -11,7 +11,7 @@ drm-y := drm_auth.o drm_bufs.o drm_cache.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_crtc.o drm_crtc_helper.o drm_modes.o drm_edid.o \ - drm_info.o drm_debugfs.o + drm_info.o drm_debugfs.o drm_global.o drm-$(CONFIG_COMPAT) += drm_ioc32.o |