Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ad5c980fdef0f339eb7c5888525acf9ce33855ec
Commit:     ad5c980fdef0f339eb7c5888525acf9ce33855ec
Parent:     48d8d7ee5dd17c64833e0343ab4ae8ef01cc2648
Author:     Ian Romanick <[EMAIL PROTECTED]>
AuthorDate: Wed Jun 27 06:38:00 2007 +1000
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Wed Jun 27 09:54:49 2007 -0700

    Add support SiS based XGI chips to SiS DRM.
    
    This adds support for some of the XGI Volari family that are based on the
    SiS.
    
    Signed-off-by: Dave Airlie <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 drivers/char/drm/drm_pciids.h |    2 ++
 drivers/char/drm/sis_drv.h    |    8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/char/drm/drm_pciids.h b/drivers/char/drm/drm_pciids.h
index aa63350..30b200b 100644
--- a/drivers/char/drm/drm_pciids.h
+++ b/drivers/char/drm/drm_pciids.h
@@ -219,6 +219,8 @@
        {0x1039, 0x6300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
        {0x1039, 0x6330, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_CHIP_315}, \
        {0x1039, 0x7300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
+       {0x18CA, 0x0040, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_CHIP_315}, \
+       {0x18CA, 0x0042, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_CHIP_315}, \
        {0, 0, 0}
 
 #define tdfx_PCI_IDS \
diff --git a/drivers/char/drm/sis_drv.h b/drivers/char/drm/sis_drv.h
index 2b8d6f6..70d4ede 100644
--- a/drivers/char/drm/sis_drv.h
+++ b/drivers/char/drm/sis_drv.h
@@ -33,11 +33,11 @@
 
 #define DRIVER_AUTHOR          "SIS, Tungsten Graphics"
 #define DRIVER_NAME            "sis"
-#define DRIVER_DESC            "SIS 300/630/540"
-#define DRIVER_DATE            "20060704"
+#define DRIVER_DESC            "SIS 300/630/540 and XGI V3XE/V5/V8"
+#define DRIVER_DATE            "20070626"
 #define DRIVER_MAJOR           1
-#define DRIVER_MINOR           2
-#define DRIVER_PATCHLEVEL      1
+#define DRIVER_MINOR           3
+#define DRIVER_PATCHLEVEL      0
 
 enum sis_family {
        SIS_OTHER = 0,
-
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