diff options
| author | Eamon Walsh <ewalsh@epoch.ncsc.mil> | 2004-05-04 19:43:35 +0000 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@epoch.ncsc.mil> | 2004-05-04 19:43:35 +0000 |
| commit | f0589e7e7f6c1794e3189624b16b4c22d0abf3fa (patch) | |
| tree | 175376ef44e371b64c0e15ac0033167311ef6c31 /src | |
| parent | f74e97735b36b4bc6dda432674f97781d959e17c (diff) | |
Merge the new release from HEADXACE-SELINUX
Diffstat (limited to 'src')
| -rw-r--r-- | src/smi_driver.c | 2 | ||||
| -rw-r--r-- | src/smi_video.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/smi_driver.c b/src/smi_driver.c index a75ea59..608d9d9 100644 --- a/src/smi_driver.c +++ b/src/smi_driver.c @@ -304,7 +304,7 @@ static XF86ModuleVersionInfo SMIVersRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, SILICONMOTION_VERSION_MAJOR, SILICONMOTION_VERSION_MINOR, SILICONMOTION_PATCHLEVEL, diff --git a/src/smi_video.c b/src/smi_video.c index 3bc4f8b..956c15f 100644 --- a/src/smi_video.c +++ b/src/smi_video.c @@ -41,7 +41,7 @@ Author of changes: Corvin Zahn <zahn@zac.de> Date: 2.11.2001 */ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_video.c,v 1.14 2003/12/08 16:03:58 alanh Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_video.c,v 1.2 2004/04/23 19:45:06 eich Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_video.c,v 1.13 2003/11/10 18:22:26 tsi Exp $ */ #include "smi.h" |