diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2011-01-14 22:09:49 +0300 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2011-01-14 22:09:49 +0300 |
commit | 42a9fa9957e369240936891c9a521ab671eed4e7 (patch) | |
tree | 7a9367594a367085c6a4a4433f687ec5c8dac8b7 /drivers/gpu/drm/radeon/Makefile | |
parent | 5f35765d836befebdfabf745fdbf2e070c887fac (diff) | |
parent | c289ef41431144a538b5fb5f94fc83c81b3020e2 (diff) | |
download | linux-42a9fa9957e369240936891c9a521ab671eed4e7.tar.xz |
Merge branch 'devicetree/next' into spi/next
Diffstat (limited to 'drivers/gpu/drm/radeon/Makefile')
-rw-r--r-- | drivers/gpu/drm/radeon/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/Makefile b/drivers/gpu/drm/radeon/Makefile index 6cae4f2028d2..e47eecfc2df4 100644 --- a/drivers/gpu/drm/radeon/Makefile +++ b/drivers/gpu/drm/radeon/Makefile @@ -65,10 +65,13 @@ radeon-y += radeon_device.o radeon_asic.o radeon_kms.o \ rs400.o rs600.o rs690.o rv515.o r520.o r600.o rv770.o radeon_test.o \ r200.o radeon_legacy_tv.o r600_cs.o r600_blit.o r600_blit_shaders.o \ r600_blit_kms.o radeon_pm.o atombios_dp.o r600_audio.o r600_hdmi.o \ - evergreen.o evergreen_cs.o evergreen_blit_shaders.o evergreen_blit_kms.o + evergreen.o evergreen_cs.o evergreen_blit_shaders.o evergreen_blit_kms.o \ + radeon_trace_points.o ni.o radeon-$(CONFIG_COMPAT) += radeon_ioc32.o radeon-$(CONFIG_VGA_SWITCHEROO) += radeon_atpx_handler.o radeon-$(CONFIG_ACPI) += radeon_acpi.o obj-$(CONFIG_DRM_RADEON)+= radeon.o + +CFLAGS_radeon_trace_points.o := -I$(src)
\ No newline at end of file |