summaryrefslogtreecommitdiff
path: root/shared-core
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@nietzche.virtuousgeek.org>2008-01-23 08:38:01 -0800
committerJesse Barnes <jbarnes@nietzche.virtuousgeek.org>2008-01-23 08:38:01 -0800
commitcb917843711ab5fe22f311cbd3eb597bce105df5 (patch)
tree69b186fea3e4cd8684ce5e5bc38656593f3c27e0 /shared-core
parent7c726086dd6591c7b32bffdcfd8e180309aad14d (diff)
Fix IS_I915G macro
One to many parantheses...
Diffstat (limited to 'shared-core')
-rw-r--r--shared-core/i915_drv.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h
index 8260529b..7a0c0ea1 100644
--- a/shared-core/i915_drv.h
+++ b/shared-core/i915_drv.h
@@ -794,6 +794,7 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
#define VSYNCSHIFT_B 0x61028
#define HACTIVE_MASK 0x00000fff
+#define VACTIVE_MASK 0x00000fff
#define VBLANK_START_MASK 0x00001fff
#define PP_STATUS 0x61200
@@ -1194,7 +1195,7 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
#define IS_I855(dev) ((dev)->pci_device == 0x3582)
#define IS_I865G(dev) ((dev)->pci_device == 0x2572)
-#define IS_I915G(dev) ((dev)->pci_device == 0x2582) || (dev)->pci_device == 0x258a)
+#define IS_I915G(dev) ((dev)->pci_device == 0x2582 || (dev)->pci_device == 0x258a)
#define IS_I915GM(dev) ((dev)->pci_device == 0x2592)
#define IS_I945G(dev) ((dev)->pci_device == 0x2772)
#define IS_I945GM(dev) ((dev)->pci_device == 0x27A2)