diff options
| author | Martin-Éric Racine <martin-eric.racine@iki.fi> | 2011-03-13 17:16:58 +0200 |
|---|---|---|
| committer | Martin-Éric Racine <martin-eric.racine@iki.fi> | 2011-03-13 17:16:58 +0200 |
| commit | 0fee3839515d9eb979adbf075afe6a549b9f0bb5 (patch) | |
| tree | 43921381b4cf125f6f4687cee13593f5ec849d01 | |
| parent | 53fbf07e3086354ba770940f4d3b88a74fb2b5d9 (diff) | |
Upgraded GX1 and GX2 components to match nsc_geode_driver.c
| -rw-r--r-- | src/nsc_gx1_driver.c | 7 | ||||
| -rw-r--r-- | src/nsc_gx2_driver.c | 8 |
2 files changed, 13 insertions, 2 deletions
diff --git a/src/nsc_gx1_driver.c b/src/nsc_gx1_driver.c index ee98dbb..ef1511c 100644 --- a/src/nsc_gx1_driver.c +++ b/src/nsc_gx1_driver.c @@ -159,7 +159,9 @@ /* Includes that are used by all drivers */ #include "xf86.h" #include "xf86_OSproc.h" +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86Resources.h" +#endif /* We may want inb() and outb() */ #include "compiler.h" @@ -178,7 +180,6 @@ /* Machine independent stuff */ #include "mipointer.h" -#include "mibank.h" #include "micmap.h" /* All drivers implementing backing store need this */ #include "mibstore.h" @@ -193,8 +194,12 @@ #include "globals.h" #include "opaque.h" +#ifdef HAVE_XEXTPROTO_71 +#include <X11/extensions/dpmsconst.h> +#else #define DPMS_SERVER #include <X11/extensions/dpms.h> +#endif /* Our private include file (this also includes the durango headers) */ #include "nsc.h" diff --git a/src/nsc_gx2_driver.c b/src/nsc_gx2_driver.c index 3f67233..057733b 100644 --- a/src/nsc_gx2_driver.c +++ b/src/nsc_gx2_driver.c @@ -153,7 +153,10 @@ /* Includes that are used by all drivers */ #include "xf86.h" #include "xf86_OSproc.h" +#include "xf86_OSproc.h" +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86Resources.h" +#endif /* We may want inb() and outb() */ #include "compiler.h" @@ -176,7 +179,6 @@ /* Machine independent stuff */ #include "mipointer.h" -#include "mibank.h" #include "micmap.h" /* All drivers implementing backing store need this */ #include "mibstore.h" @@ -191,8 +193,12 @@ #include "globals.h" #include "opaque.h" +#ifdef HAVE_XEXTPROTO_71 +#include <X11/extensions/dpmsconst.h> +#else #define DPMS_SERVER #include <X11/extensions/dpms.h> +#endif /* Our private include file (this also includes the durango headers) */ #include "nsc.h" |