diff options
| author | Dave Airlie <airlied@redhat.com> | 2007-11-20 13:02:43 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2007-11-20 13:02:43 +1000 |
| commit | 5d023e2c3c2ab44ea57ffadc9607025d602c376c (patch) | |
| tree | 473ee40a46e603e3c0df6c153e8b8d5a371be395 /src/Makefile.am | |
| parent | 0d1e0c7805b3d8e56ccb49465e6b144afb7bdc51 (diff) | |
| parent | c8872603454e6a4ffed9fc7d9adc2c364a429608 (diff) | |
Merge branch 'master' into atombios-support
Conflicts:
src/radeon_chipset.h
src/radeon_driver.c
src/radeon_probe.c
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 46e5ca10..938c5fd0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -189,7 +189,6 @@ EXTRA_DIST = \ r128_reg.h \ r128_sarea.h \ r128_version.h \ - radeon_chipset.h \ radeon_common.h \ radeon_commonfuncs.c \ radeon_dri.h \ @@ -210,4 +209,10 @@ EXTRA_DIST = \ theatre.h \ theatre_reg.h \ atipciids.h \ - atipcirename.h + atipcirename.h \ + ati_pciids_gen.h \ + radeon_chipinfo_gen.h \ + radeon_chipset_gen.h \ + radeon_pci_chipset_gen.h \ + pcidb/ati_pciids.csv \ + pcidb/parse_pci_ids.pl |