[PATCH 03/15] xfree86: remove unused -s option

[Tiago Vignatti]

Such option sets xf86sFlag, which is unused.

Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>
---
 hw/xfree86/common/xf86Globals.c |    1 -
 hw/xfree86/common/xf86Init.c    |    6 ------
 hw/xfree86/common/xf86Priv.h    |    1 -
 3 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
index 781ee49..3ec35a3 100644
--- a/hw/xfree86/common/xf86Globals.c
+++ b/hw/xfree86/common/xf86Globals.c
@@ -170,7 +170,6 @@ const char *xf86VisualNames[] = {
 /* Parameters set only from the command line */
 char *xf86ServerName = "no-name";
 Bool xf86fpFlag = FALSE;
-Bool xf86sFlag = FALSE;
 Bool xf86bsEnableFlag = FALSE;
 Bool xf86bsDisableFlag = FALSE;
 Bool xf86silkenMouseDisableFlag = FALSE;
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 65afa0a..1ea8322 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -1194,12 +1194,6 @@ ddxProcessArgument(int argc, char **argv, int i)
     xf86bsEnableFlag = TRUE;
     return 0;
   }
-  /* Notice the -s flag, but allow it to pass to the dix layer */
-  if (!strcmp(argv[i], "-s"))
-  {
-    xf86sFlag = TRUE;
-    return 0;
-  }
   if (!strcmp(argv[i], "-pixmap24"))
   {
     xf86Pix24 = Pix24Use24;
diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
index 08c0fa9..0d8506b 100644
--- a/hw/xfree86/common/xf86Priv.h
+++ b/hw/xfree86/common/xf86Priv.h
@@ -51,7 +51,6 @@ extern _X_EXPORT  Bool xf86VidModeDisabled;
 extern _X_EXPORT  Bool xf86VidModeAllowNonLocal;
 #endif 
 extern _X_EXPORT  Bool xf86fpFlag;
-extern _X_EXPORT  Bool xf86sFlag;
 extern _X_EXPORT  Bool xf86bsEnableFlag;
 extern _X_EXPORT  Bool xf86bsDisableFlag;
 extern _X_EXPORT  Bool xf86silkenMouseDisableFlag;
-- 
1.7.0.4