The patch titled
drm: add some pci ids for XGI chips
has been added to the -mm tree. Its filename is
add-some-pci-ids-for-xgi-chips.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: drm: add some pci ids for XGI chips
From: Ian Romanick <idr@xxxxxxxxxx>
This adds support for some of the XGI Volari family that are based on the SiS.
Signed-off-by: Dave Airlie <airlied@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/char/drm/drm_pciids.h | 2 ++
drivers/char/drm/sis_drv.h | 8 ++++----
2 files changed, 6 insertions(+), 4 deletions(-)
diff -puN drivers/char/drm/drm_pciids.h~add-some-pci-ids-for-xgi-chips drivers/char/drm/drm_pciids.h
--- a/drivers/char/drm/drm_pciids.h~add-some-pci-ids-for-xgi-chips
+++ a/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 -puN drivers/char/drm/sis_drv.h~add-some-pci-ids-for-xgi-chips drivers/char/drm/sis_drv.h
--- a/drivers/char/drm/sis_drv.h~add-some-pci-ids-for-xgi-chips
+++ a/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,
_
Patches currently in -mm which might be from idr@xxxxxxxxxx are
add-some-pci-ids-for-xgi-chips.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
