xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/i2c/uda1380_module.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree a3d2c5d622d9ca36d6fa2966aff09524e3ea39ac (from e9bfb2b3d7dfaafd90d2ad0fa3d0e1acced4380b)
Author: Adam Jackson <ajax at benzedrine.nwnk.net>
Date:   Wed Mar 7 11:02:47 2007 -0500

    XORG_VERSION_CURRENT, not XF86_VERSION_CURRENT.
    
    If only this was the least wrong thing in this code.

diff --git a/hw/xfree86/i2c/uda1380_module.c b/hw/xfree86/i2c/uda1380_module.c
index 3844583..895f8c6 100644
--- a/hw/xfree86/i2c/uda1380_module.c
+++ b/hw/xfree86/i2c/uda1380_module.c
@@ -12,7 +12,7 @@ static XF86ModuleVersionInfo uda1380Vers
         MODULEVENDORSTRING,
         MODINFOSTRING1,
         MODINFOSTRING2,
-        XF86_VERSION_CURRENT,
+        XORG_VERSION_CURRENT,
         1, 0, 0,
         ABI_CLASS_VIDEODRV,             /* This needs the video driver ABI */
         ABI_VIDEODRV_VERSION,