diff options
| author | Dave Airlie <airlied@linux.ie> | 2007-02-25 23:27:19 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2007-02-25 23:27:19 +1100 |
| commit | 3cfe94d5438961b869766dacbcd13fde8b770ca2 (patch) | |
| tree | 8439af3ec0d4d7b4b7a7413bf5ca415c021f876e /src/Makefile.am | |
| parent | 31c018ca4a18ce426b29006f103f56eee7f985fa (diff) | |
| parent | 3b43788c45f51ad2d3e8e64383c412f4ddd97207 (diff) | |
Merge branch 'radeon-randrv12-v4'
Conflicts:
src/radeon_display.c
src/radeon_driver.c
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index f31c0181..b2361f14 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -79,9 +79,10 @@ radeon_drv_la_LTLIBRARIES = radeon_drv.la radeon_drv_la_LDFLAGS = -module -avoid-version radeon_drv_ladir = @moduledir@/drivers radeon_drv_la_SOURCES = \ - radeon_accel.c radeon_mergedfb.c radeon_cursor.c radeon_dga.c \ + radeon_accel.c radeon_cursor.c radeon_dga.c \ radeon_driver.c radeon_video.c radeon_bios.c radeon_mm_i2c.c \ - radeon_vip.c radeon_misc.c radeon_display.c radeon_modes.c $(RADEON_DRI_SRCS) $(RADEON_EXA_SOURCES) + radeon_vip.c radeon_misc.c radeon_display.c radeon_modes.c \ + $(RADEON_DRI_SRCS) $(RADEON_EXA_SOURCES) theatre_detect_drv_la_LTLIBRARIES = theatre_detect_drv.la theatre_detect_drv_la_LDFLAGS = -module -avoid-version @@ -178,12 +179,13 @@ EXTRA_DIST = \ radeon_exa_funcs.c \ radeon.h \ radeon_macros.h \ - radeon_mergedfb.h \ radeon_probe.h \ radeon_reg.h \ radeon_sarea.h \ radeon_version.h \ radeon_video.h \ + radeon_xf86Modes.h \ + radeon_xf86Crtc.h \ theatre200.h \ theatre_detect.h \ theatre.h \ |