xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/doc/ddxDesign.xml |    6 ------
 hw/xfree86/loader/loadmod.c  |    3 ---
 2 files changed, 9 deletions(-)

New commits:
commit 184fbf7541012090b8716c7eaf00895efd16d0ac
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Mar 14 11:37:32 2016 -0400

    xfree86: Finish removing font modules
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/hw/xfree86/doc/ddxDesign.xml b/hw/xfree86/doc/ddxDesign.xml
index aed77a9..53647d0 100644
--- a/hw/xfree86/doc/ddxDesign.xml
+++ b/hw/xfree86/doc/ddxDesign.xml
@@ -5560,10 +5560,6 @@ The fields are used as follows:
 		    <term><constant>ABI_CLASS_EXTENSION</constant></term>
 		    <listitem><para>requires the extension module ABI
 		      </para></listitem></varlistentry>
-		  <varlistentry>
-		    <term><constant>ABI_CLASS_FONT</constant></term>
-		    <listitem><para>requires the font module ABI
-		      </para></listitem></varlistentry>
 		</variablelist>
 
 	      </para></listitem></varlistentry>
@@ -5583,7 +5579,6 @@ The fields are used as follows:
                    ABI_VIDEODRV_VERSION
                    ABI_XINPUT_VERSION
                    ABI_EXTENSION_VERSION
-                   ABI_FONT_VERSION
 		  </constant></literallayout>
 
 	      </para></listitem></varlistentry>
@@ -5603,7 +5598,6 @@ The fields are used as follows:
                    MOD_CLASS_NONE
                    MOD_CLASS_VIDEODRV
                    MOD_CLASS_XINPUT
-                   MOD_CLASS_FONT
                    MOD_CLASS_EXTENSION
 		  </constant></literallayout>
 
diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c
index 73dc1b8..702d4e7 100644
--- a/hw/xfree86/loader/loadmod.c
+++ b/hw/xfree86/loader/loadmod.c
@@ -86,7 +86,6 @@ const ModuleVersions LoaderVersionInfo = {
     ABI_VIDEODRV_VERSION,
     ABI_XINPUT_VERSION,
     ABI_EXTENSION_VERSION,
-    ABI_FONT_VERSION
 };
 
 static int ModuleDuplicated[] = { };
@@ -613,8 +612,6 @@ CheckVersion(const char *module, XF86ModuleVersionInfo * data,
             ver = LoaderVersionInfo.xinputVersion;
         else if (!strcmp(data->abiclass, ABI_CLASS_EXTENSION))
             ver = LoaderVersionInfo.extensionVersion;
-        else if (!strcmp(data->abiclass, ABI_CLASS_FONT))
-            ver = LoaderVersionInfo.fontVersion;
 
         abimaj = GET_ABI_MAJOR(data->abiversion);
         abimin = GET_ABI_MINOR(data->abiversion);