From a86fa301f95388ae1f0b9e2feb957d58318c8d26 Mon Sep 17 00:00:00 2001
From: shadchin <shadchin@openbsd.org>
Date: Wed, 9 Nov 2011 16:04:50 +0000
Subject: [PATCH] Remove call xf86CollectInputOptions. It is useless if second
 arg is NULL.

ok matthieu@
---
 driver/xf86-input-ws/src/ws.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/driver/xf86-input-ws/src/ws.c b/driver/xf86-input-ws/src/ws.c
index 368152549..bcf23e82b 100644
--- a/driver/xf86-input-ws/src/ws.c
+++ b/driver/xf86-input-ws/src/ws.c
@@ -13,7 +13,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-/* $OpenBSD: ws.c,v 1.42 2011/11/08 12:57:44 shadchin Exp $ */
+/* $OpenBSD: ws.c,v 1.43 2011/11/09 16:04:50 shadchin Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -134,7 +134,6 @@ wsPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
 	}
 	pInfo->private = priv;
 
-	xf86CollectInputOptions(pInfo, NULL);
 #ifdef DEBUG
 	ws_debug_level = xf86SetIntOption(pInfo->options, "DebugLevel",
 	    ws_debug_level);