Fix autoconfiguration for accelerated drivers on sparc/sparc64. Currently

limited to sunffb; others will need to be added to bsd_sbus.c if we start
shipping them.

ok matthieu@, oga@

2 files changed, 12 insertions, 1 deletions

diff --git a/xserver/hw/xfree86/common/xf86AutoConfig.c b/xserver/hw/xfree86/common/xf86AutoConfig.c
index 2e10eb5eb..c15a6fd21 100644
--- a/xserver/hw/xfree86/common/xf86AutoConfig.c
+++ b/xserver/hw/xfree86/common/xf86AutoConfig.c
@@ -468,7 +468,7 @@ listPossibleVideoDrivers(char *matches[], int nmatches)
 	}
     }
 #endif
-#if defined(__sparc__) && !defined(__OpenBSD__)
+#if defined(__sparc__)
     {
 	char *sbusDriver = sparcDriverName();
 	if (sbusDriver)
diff --git a/xserver/hw/xfree86/os-support/bsd/bsd_sbus.c b/xserver/hw/xfree86/os-support/bsd/bsd_sbus.c
index 385ac51f1..d518ece17 100644
--- a/xserver/hw/xfree86/os-support/bsd/bsd_sbus.c
+++ b/xserver/hw/xfree86/os-support/bsd/bsd_sbus.c
@@ -190,3 +190,14 @@ void
 sparcPromClose(void)
 {
 }
+
+char *
+sparcDriverName(void)
+{
+	switch (sbusInfo.devId) {
+	case SBUS_DEVICE_FFB:
+		return "sunffb";
+	default:
+		return NULL;
+	}
+}