diff options
author | Ian Romanick <idr@umwelt.(none)> | 2006-08-25 09:34:21 -0700 |
---|---|---|
committer | Ian Romanick <idr@umwelt.(none)> | 2006-08-25 09:34:21 -0700 |
commit | 21291d6ca7188e5733ed0c93215ee0f1f0f90cc9 (patch) | |
tree | 164ae681be0cfee5fc239a999e296547d3343312 /hw/xfree86/vgahw | |
parent | 1a5561c4ecccaf32b03c41373adf376100d457aa (diff) | |
parent | cd2da4e41eae233b50f8830d9a8f5d1d916a5a1b (diff) |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Diffstat (limited to 'hw/xfree86/vgahw')
-rw-r--r-- | hw/xfree86/vgahw/vgaHW.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/xfree86/vgahw/vgaHW.h b/hw/xfree86/vgahw/vgaHW.h index 0879f9641..ff7d1e5e0 100644 --- a/hw/xfree86/vgahw/vgaHW.h +++ b/hw/xfree86/vgahw/vgaHW.h @@ -175,7 +175,7 @@ typedef struct _vgaHWRec { #define BITS_PER_GUN 6 #define COLORMAP_SIZE 256 -#if defined(__powerpc__) +#if defined(__powerpc__) || defined(__arm__) || defined(__s390__) #define DACDelay(hw) /* No legacy VGA support */ #else #define DACDelay(hw) \ |