~ubuntu-branches/ubuntu/hardy/xserver-xorg-video-ati/hardy

Committer: Bazaar Package Importer
Author(s): Timo Aaltonen
Date: 2007-10-06 12:13:31 UTC
mfrom: (1.1.8 upstream)
Revision ID: james.westby@ubuntu.com-20071006121331-l0jcbuztjsmie3a9

Tags: 1:6.7.195-1ubuntu1

* Merge with Debian experimental, remaining changes:
  - debian/control
    * Ease the Build-Depends on xserver-xorg-dev.
    * Change Maintainer-address.

files added:
src/atipcirename.h

files removed:
.gitignore

debian/patches/02_mode_code_cleanup.diff

debian/patches/03_LVDS_mode_validation.diff

debian/patches/04_remove_cruft.diff

debian/patches/05_ext_tdms_table.diff

debian/patches/06_initdispbandwidth.diff

debian/patches/07_sort_out_LVDS_modes.diff

debian/patches/08_disable_dri_rc410.diff

debian/patches/09_mode_and_output_fixes.diff

debian/patches/10_disable_dri_rs485.diff

files modified:
ChangeLog

Makefile.in

configure

configure.ac

debian/changelog

debian/patches/01_gen_pci_ids.diff

debian/patches/series

man/Makefile.in

src/Makefile.am

src/Makefile.in

src/ati.c

src/atidri.c

src/atimach64probe.c

src/atipciids.h

src/atipreinit.c

src/atiprint.c

src/atiprobe.c

src/atistruct.h

src/atividmem.c

src/r128_probe.c

src/radeon.h

src/radeon_accel.c

src/radeon_bios.c

src/radeon_chipset.h

src/radeon_display.c

src/radeon_dri.c

src/radeon_driver.c

src/radeon_exa.c

src/radeon_exa_funcs.c

src/radeon_modes.c

src/radeon_output.c

src/radeon_probe.c

src/radeon_probe.h

src/radeon_reg.h

src/radeon_video.c

Show diffs side-by-side

added added

removed removed

src/atimach64probe.c

146

int numUsed;

147

Bool ProbeSuccess = FALSE;

148

149

#ifndef XSERVER_LIBPCIACCESS

149

150

if (xf86GetPciVideoInfo() == NULL)

150

151

return FALSE;

152

#endif

151

153

152

154

if ((numDevSections = xf86MatchDevice(ATI_DRIVER_NAME, &devSections)) <= 0)

153

155

return FALSE;

Older »