~ubuntu-branches/ubuntu/natty/xserver-xorg-video-nv/natty

« back to all changes in this revision

Viewing changes to src/g80_sor.c

  • Committer: Bazaar Package Importer
  • Author(s): Timo Aaltonen
  • Date: 2009-12-07 17:48:09 UTC
  • mfrom: (1.1.18 upstream) (14.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20091207174809-qp9mqpx55qkidw08
Tags: 1:2.1.15-1ubuntu1
* Merge from Debian experimental, remaining changes:
  - Re-enabled the patch system, we need that. Add quilt in build-deps.
  - 100_fedora-panel-fix.patch:
    Don't discard EDID blocks just because their input type bit
    disagrees with the hardware connection sensing; this usually
    just means the block is lying. (cf. LP: 188549).
  - 105_gf7025_gf7050.patch:
    Fedora patch to add support for 7025/7050 IGP chipsets.
    (LP: 220364)
  - 0001-Move-the-logic-for-matching-devices-out-of-probe-rou.patch
    + Disable the logic for matching devices in the probe routine.
    + Instead match explicitly on pci_id_match (LP: 385658)
  - 0002-Run-the-parsing-script-to-generate-an-initial-list-o.patch
    + Generate the list of devices to match once

Show diffs side-by-side

added added

removed removed

Lines of Context:
25
25
#include "config.h"
26
26
#endif
27
27
 
 
28
#ifdef HAVE_XEXTPROTO_71
 
29
#include <X11/extensions/dpmsconst.h>
 
30
#else
28
31
#define DPMS_SERVER
29
32
#include <X11/extensions/dpms.h>
 
33
#endif
 
34
 
30
35
#include <X11/Xatom.h>
31
36
 
32
37
#include "g80_type.h"