Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=2f4042b186b9bfe82f48fe801619c6c285c16bef
Commit:     2f4042b186b9bfe82f48fe801619c6c285c16bef
Parent:     845a2fdcbd5bc5b9f652201ee95c825827a1d521
Author:     Wang Zhenyu <[EMAIL PROTECTED]>
AuthorDate: Fri Jun 1 22:03:44 2007 +1000
Committer:  Dave Airlie <[EMAIL PROTECTED]>
CommitDate: Sun Jun 10 14:31:30 2007 +1000

    i915: add new pciids for 945GME, 965GME/GLE
    
    Signed-off-by: Dave Airlie <[EMAIL PROTECTED]>
---
 drivers/char/drm/drm_pciids.h |    2 ++
 drivers/char/drm/i915_dma.c   |    3 ++-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/drivers/char/drm/drm_pciids.h b/drivers/char/drm/drm_pciids.h
index 177ccc0..e908462 100644
--- a/drivers/char/drm/drm_pciids.h
+++ b/drivers/char/drm/drm_pciids.h
@@ -300,10 +300,12 @@
        {0x8086, 0x2592, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
        {0x8086, 0x2772, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
        {0x8086, 0x27a2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
+       {0x8086, 0x27ae, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
        {0x8086, 0x2972, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
        {0x8086, 0x2982, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
        {0x8086, 0x2992, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
        {0x8086, 0x29a2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
        {0x8086, 0x2a02, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
+       {0x8086, 0x2a12, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
        {0, 0, 0}
 
diff --git a/drivers/char/drm/i915_dma.c b/drivers/char/drm/i915_dma.c
index 1ba15d9..730dfee 100644
--- a/drivers/char/drm/i915_dma.c
+++ b/drivers/char/drm/i915_dma.c
@@ -35,7 +35,8 @@
                       dev->pci_device == 0x2982 || \
                       dev->pci_device == 0x2992 || \
                       dev->pci_device == 0x29A2 || \
-                      dev->pci_device == 0x2A02)
+                      dev->pci_device == 0x2A02 || \
+                      dev->pci_device == 0x2A12)
 
 /* Really want an OS-independent resettable timer.  Would like to have
  * this loop run for (eg) 3 sec, but have the timer reset every time
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to