diff options
| author | Keith Packard <keithp@guitar.keithp.com> | 2007-02-16 02:19:10 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@guitar.keithp.com> | 2007-02-16 02:19:10 -0800 |
| commit | 0ca926e63c7fa9122a8cba1424ce4cdee1c7b215 (patch) | |
| tree | 81b26423182b51483ce27ad1dc8d057ea56e55be /src/ch7xxx | |
| parent | 972f1109d23c0a3f821fa573e2aa40cd17ce2795 (diff) | |
Check for presence of xf86Modes.h file.
xf86Modes.h file signals the availability of the new modes API in the
server; use that instead of counting on X server version numbers.
Also, finish eliminating use of local copies of those header files.
Diffstat (limited to 'src/ch7xxx')
| -rw-r--r-- | src/ch7xxx/Makefile.am | 2 | ||||
| -rw-r--r-- | src/ch7xxx/ch7xxx.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ch7xxx/Makefile.am b/src/ch7xxx/Makefile.am index 7f3b1e1e..b827bf8e 100644 --- a/src/ch7xxx/Makefile.am +++ b/src/ch7xxx/Makefile.am @@ -3,7 +3,7 @@ # -avoid-version prevents gratuitous .0.0.0 version numbers on the end # _ladir passes a dummy rpath to libtool so the thing will actually link # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. -AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -I$(srcdir)/../ +AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -I$(srcdir)/.. -I$(srcdir)/../modes ch7xxx_la_LTLIBRARIES = ch7xxx.la ch7xxx_la_LDFLAGS = -module -avoid-version diff --git a/src/ch7xxx/ch7xxx.c b/src/ch7xxx/ch7xxx.c index 161aebf4..9ce581fa 100644 --- a/src/ch7xxx/ch7xxx.c +++ b/src/ch7xxx/ch7xxx.c @@ -37,7 +37,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "compiler.h" #include "miscstruct.h" #include "xf86i2c.h" -#include "i830_xf86Crtc.h" +#include "xf86Crtc.h" #define DPMS_SERVER #include <X11/extensions/dpms.h> |