diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2006-12-05 18:28:33 +1030 |
|---|---|---|
| committer | Peter Hutterer <whot@hyena.localdomain> | 2006-12-05 18:28:33 +1030 |
| commit | 3c8f166022a2d19af14eb670fa382503ba1451cd (patch) | |
| tree | dd9865596afc91a3f37a24c04533dd4a957627a0 /hw/xfree86/ramdac | |
| parent | 2a511492f9a235d3f5390ab87b6c643cbea92d88 (diff) | |
| parent | f9f7d7f3be53c808abb5eaceb7a1abc55744a210 (diff) | |
Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/xserver into mpx
Conflicts:
dix/events.c
Diffstat (limited to 'hw/xfree86/ramdac')
| -rw-r--r-- | hw/xfree86/ramdac/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/xfree86/ramdac/Makefile.am b/hw/xfree86/ramdac/Makefile.am index c9afdad60..8d944455f 100644 --- a/hw/xfree86/ramdac/Makefile.am +++ b/hw/xfree86/ramdac/Makefile.am @@ -13,7 +13,7 @@ EXTRA_DIST = BTPriv.h IBMPriv.h TIPriv.h xf86CursorPriv.h xf86RamDacPriv.h \ CURSOR.NOTES AM_CFLAGS = -DXAAReverseBitOrder=xf86ReverseBitOrder -DRAMDAC_MODULE \ - $(XORG_CFLAGS) + $(DIX_CFLAGS) $(XORG_CFLAGS) INCLUDES = $(XORG_INCS) xf86BitOrder.c: |