From 7e85184a7ce1e1af3e07f61f6cc031c3a9eef301 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Wed, 23 Jan 2008 16:41:17 +1000 Subject: [PATCH] --- yaml --- r: 84035 b: refs/heads/master c: 4d1f78880e9631fb08052dcc8e3341eecea537e0 h: refs/heads/master i: 84033: d7022524d6efd695eac69b6c3d4f8839cd537941 84031: 9b9c86291a3a1babd34846f8ad9e475d54d2b4ca v: v3 --- [refs] | 2 +- trunk/drivers/char/drm/i915_drv.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b19ac8ff769d..65a932398d39 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d5b0d1b5bda979b077cf011e79fc19677663afc4 +refs/heads/master: 4d1f78880e9631fb08052dcc8e3341eecea537e0 diff --git a/trunk/drivers/char/drm/i915_drv.h b/trunk/drivers/char/drm/i915_drv.h index 661e2f571195..9c3f71798611 100644 --- a/trunk/drivers/char/drm/i915_drv.h +++ b/trunk/drivers/char/drm/i915_drv.h @@ -1075,7 +1075,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 == PCI_DEVICE_ID_INTELPCI_CHIP_E7221_G)*/ +#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)