xserver: Branch 'master'

[Keith Packard]

 hw/kdrive/ephyr/ephyrinit.c |   16 ----------------
 1 file changed, 16 deletions(-)

New commits:
commit f2d149b6d10edea7233d93c7e19f71decf11dc62
Author: Keith Packard <keithp at keithp.com>
Date:   Fri Oct 4 16:43:41 2013 -0700

    kdrive/ephyr: Remove duplicate ephyrExtensions and ephyrExtensionInit decls
    
    These were duplicated when GLX support was re-added on two different branches.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c
index 80b7a6a..cf8bc90 100644
--- a/hw/kdrive/ephyr/ephyrinit.c
+++ b/hw/kdrive/ephyr/ephyrinit.c
@@ -48,22 +48,6 @@ extern KdKeyboardDriver LinuxEvdevKeyboardDriver;
 
 void processScreenArg(const char *screen_size, char *parent_id);
 
-static const
-ExtensionModule ephyrExtensions[] = {
-#ifdef GLXEXT
-    {GlxExtensionInit, "GLX", &noGlxExtension},
-#endif
-};
-
-static void
-ephyrExtensionInit(void)
-{
-    int i;
-
-    for (i = 0; i < ARRAY_SIZE(ephyrExtensions); i++)
-        LoadExtension(&ephyrExtensions[i], TRUE);
-}
-
 void
 InitCard(char *name)
 {