diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-03-01 05:50:01 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@ppcg5.localdomain> | 2010-03-01 06:21:58 -0500 |
| commit | 8edb381d6705811b278527907a5ae2a9c4db8074 (patch) | |
| tree | 3e9c0c6474eba65cfafc2652c49be002ae76a493 /drivers/gpu/drm/radeon/Makefile | |
| parent | 55a5cb5d594c18b3147a2288b00ea359c1a38cf8 (diff) | |
vga_switcheroo: fix build on platforms with no ACPI
radeon was always including the atpx code unnecessarily, also core
switcheroo was including acpi headers.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/Makefile')
| -rw-r--r-- | drivers/gpu/drm/radeon/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/Makefile b/drivers/gpu/drm/radeon/Makefile index 0a4d526e4f44..0adf49eea7fa 100644 --- a/drivers/gpu/drm/radeon/Makefile +++ b/drivers/gpu/drm/radeon/Makefile | |||
| @@ -60,8 +60,9 @@ radeon-y += radeon_device.o radeon_kms.o \ | |||
| 60 | rs400.o rs600.o rs690.o rv515.o r520.o r600.o rv770.o radeon_test.o \ | 60 | rs400.o rs600.o rs690.o rv515.o r520.o r600.o rv770.o radeon_test.o \ |
| 61 | r200.o radeon_legacy_tv.o r600_cs.o r600_blit.o r600_blit_shaders.o \ | 61 | r200.o radeon_legacy_tv.o r600_cs.o r600_blit.o r600_blit_shaders.o \ |
| 62 | r600_blit_kms.o radeon_pm.o atombios_dp.o r600_audio.o r600_hdmi.o \ | 62 | r600_blit_kms.o radeon_pm.o atombios_dp.o r600_audio.o r600_hdmi.o \ |
| 63 | evergreen.o radeon_atpx_handler.o | 63 | evergreen.o |
| 64 | 64 | ||
| 65 | radeon-$(CONFIG_COMPAT) += radeon_ioc32.o | 65 | radeon-$(CONFIG_COMPAT) += radeon_ioc32.o |
| 66 | radeon-$(CONFIG_VGA_SWITCHEROO) += radone_atpx_handler.o | ||
| 66 | 67 | ||
| 67 | obj-$(CONFIG_DRM_RADEON)+= radeon.o | 68 | obj-$(CONFIG_DRM_RADEON)+= radeon.o |