summaryrefslogtreecommitdiff
path: root/x11-servers/xorg-server-snap/files/patch-atiprobe.c
diff options
context:
space:
mode:
authorDejan Lesjak <lesi@FreeBSD.org>2005-03-17 23:22:13 +0000
committerDejan Lesjak <lesi@FreeBSD.org>2005-03-17 23:22:13 +0000
commitac39221672c3c391a6c127d2fcc67a1fe3d4512e (patch)
treede7ec01912bcb217296d86bd4fad9fd5b211f0cf /x11-servers/xorg-server-snap/files/patch-atiprobe.c
parent- Update to 2.1.3. (diff)
Upgrade X.Org ports to 6.8.2.
Release notes are available at http://www.x.org/X11R6.8.2/doc/RELNOTES.html Thanks to kris and krion for running several cluster test builds, maintainers of GNOME for prompt responses, portmgr for postponing ports freeze for this update, testers on FreeBSD-X11@ list and others that I might have mised here. Also included: - fix for ATI Mobility on Dell Inspiron 7500 (obtained from Marc Aurele La France; obtained and tested by julian) - fix for kbd driver on Sparc64 (tested by Aaron Dudek, Michael G. Jung and Matthias Muthmann), which still appears to have problems with some keyboards - so - fix for kbd driver on PC98 (reported and tested by NAKAJI Hiroyuki; PR ports/77217) - fix for i810 on HP D530 (obtained from Egbert Eich; obtained and tested by Anders Nor Berle; PR ports/74757)
Notes
Notes: svn path=/head/; revision=131533
Diffstat (limited to 'x11-servers/xorg-server-snap/files/patch-atiprobe.c')
-rw-r--r--x11-servers/xorg-server-snap/files/patch-atiprobe.c18
1 files changed, 0 insertions, 18 deletions
diff --git a/x11-servers/xorg-server-snap/files/patch-atiprobe.c b/x11-servers/xorg-server-snap/files/patch-atiprobe.c
deleted file mode 100644
index cb7371b1f153..000000000000
--- a/x11-servers/xorg-server-snap/files/patch-atiprobe.c
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: programs/Xserver/hw/xfree86/drivers/ati/atiprobe.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ati/atiprobe.c,v
-retrieving revision 1.3
-retrieving revision 1.3.2.2
-diff -u -u -r1.3 -r1.3.2.2
---- programs/Xserver/hw/xfree86/drivers/ati/atiprobe.c 30 Jul 2004 20:30:51 -0000 1.3
-+++ programs/Xserver/hw/xfree86/drivers/ati/atiprobe.c 15 Dec 2004 08:47:20 -0000 1.3.2.2
-@@ -1554,6 +1560,9 @@
- continue;
-
- pPCI = pVideo->thisCard;
-+ if (pPCI == NULL)
-+ continue;
-+
- PciReg = pciReadLong(pPCI->tag, PCI_REG_USERCONFIG);
- j = PciReg & 0x03U;
- if (j == 0x03U)