From 003c297d2902092074ede131db0dbc08d9116a5b Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon, 1 Dec 2008 14:36:06 -0800
Subject: [PATCH] sun_mouse: check for Device in commonOptions if
 pInfo->options isn't set yet

---
 src/sun_mouse.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/sun_mouse.c b/src/sun_mouse.c
index 13ce074..827af34 100644
--- a/src/sun_mouse.c
+++ b/src/sun_mouse.c
@@ -622,6 +622,10 @@ solarisMouseAutoProbe(InputInfoPtr pInfo, const char **protocol,
     if (*device == NULL) {
 	/* Check to see if xorg.conf or HAL specified a device to use */
 	*device = xf86CheckStrOption(pInfo->options, "Device", NULL);
+	if (*device == NULL) {
+	    *device = xf86CheckStrOption(pInfo->conf_idev->commonOptions,
+					 "Device", NULL);
+	}
     }
 
     if (*device != NULL) {