summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWang Zhenyu <zhenyu.z.wang@intel.com>2007-02-02 09:51:38 +0800
committerWang Zhenyu <zhenyu.z.wang@intel.com>2007-02-02 09:51:38 +0800
commit9907b32c6790f6e9dad42cdce60e3b1b457233e5 (patch)
tree7e91f60c4f35637e93f8e730c878d9b096654230
parent3886b7e62925a6eb7ca05e3ab23f3d4781439d06 (diff)
Revert origin crestline pci id patch
-rw-r--r--shared-core/drm_pciids.txt1
-rw-r--r--shared-core/i915_dma.c3
2 files changed, 1 insertions, 3 deletions
diff --git a/shared-core/drm_pciids.txt b/shared-core/drm_pciids.txt
index 76cfffd5..0d2639e1 100644
--- a/shared-core/drm_pciids.txt
+++ b/shared-core/drm_pciids.txt
@@ -278,7 +278,6 @@
0x8086 0x2982 0 "Intel i965G"
0x8086 0x2992 0 "Intel i965Q"
0x8086 0x29A2 0 "Intel i965G"
-0x8086 0x2A02 0 "Intel Crestline"
[imagine]
0x105d 0x2309 IMAGINE_128 "Imagine 128"
diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c
index a2f1243a..912fe0b1 100644
--- a/shared-core/i915_dma.c
+++ b/shared-core/i915_dma.c
@@ -34,8 +34,7 @@
#define IS_I965G(dev) (dev->pci_device == 0x2972 || \
dev->pci_device == 0x2982 || \
dev->pci_device == 0x2992 || \
- dev->pci_device == 0x29A2 || \
- dev->pci_device == 0x2A02)
+ dev->pci_device == 0x29A2)
/* Really want an OS-independent resettable timer. Would like to have