aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/drm/i915_dma.c
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2006-09-21 14:19:34 -0400
committerDave Airlie <airlied@linux.ie>2006-09-21 15:32:34 -0400
commit2f02cc3fb8960754a2a5df6a33f53528e0d830be (patch)
tree73c692f47c6f589e394b71b89122f9566ecbd11d /drivers/char/drm/i915_dma.c
parente08870c87ab5b0c0c3cb05d0d0041240736493e4 (diff)
drm: add device/vendor id to drm_device_t for compat with FreeBSD drivers
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/i915_dma.c')
-rw-r--r--drivers/char/drm/i915_dma.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/drm/i915_dma.c b/drivers/char/drm/i915_dma.c
index a7924e28a847..fb7913ff5286 100644
--- a/drivers/char/drm/i915_dma.c
+++ b/drivers/char/drm/i915_dma.c
@@ -31,10 +31,10 @@
31#include "i915_drm.h" 31#include "i915_drm.h"
32#include "i915_drv.h" 32#include "i915_drv.h"
33 33
34#define IS_I965G(dev) (dev->pdev->device == 0x2972 || \ 34#define IS_I965G(dev) (dev->pci_device == 0x2972 || \
35 dev->pdev->device == 0x2982 || \ 35 dev->pci_device == 0x2982 || \
36 dev->pdev->device == 0x2992 || \ 36 dev->pci_device == 0x2992 || \
37 dev->pdev->device == 0x29A2) 37 dev->pci_device == 0x29A2)
38 38
39/* Really want an OS-independent resettable timer. Would like to have 39/* Really want an OS-independent resettable timer. Would like to have
40 * this loop run for (eg) 3 sec, but have the timer reset every time 40 * this loop run for (eg) 3 sec, but have the timer reset every time