From ed7eed23f034d40dc0578220ab6838e0340812fc Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Wed, 27 Jun 2007 06:38:00 +1000 Subject: [PATCH] --- yaml --- r: 58051 b: refs/heads/master c: ad5c980fdef0f339eb7c5888525acf9ce33855ec h: refs/heads/master i: 58049: 07763c027a3f2f97d601bd8f84131504dfffde68 58047: de7fad40e60a9de47897ea9a0194a622c530db76 v: v3 --- [refs] | 2 +- trunk/drivers/char/drm/drm_pciids.h | 2 ++ trunk/drivers/char/drm/sis_drv.h | 8 ++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 0a70bbf4608f..2903340f1bcb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 48d8d7ee5dd17c64833e0343ab4ae8ef01cc2648 +refs/heads/master: ad5c980fdef0f339eb7c5888525acf9ce33855ec diff --git a/trunk/drivers/char/drm/drm_pciids.h b/trunk/drivers/char/drm/drm_pciids.h index aa6335032d1e..30b200b01314 100644 --- a/trunk/drivers/char/drm/drm_pciids.h +++ b/trunk/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/trunk/drivers/char/drm/sis_drv.h b/trunk/drivers/char/drm/sis_drv.h index 2b8d6f6ed7c0..70d4ede75fe8 100644 --- a/trunk/drivers/char/drm/sis_drv.h +++ b/trunk/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,