From 912dd06aeda9a1b8d427583a2b477527d2a5fcd9 Mon Sep 17 00:00:00 2001
From: Marius Strobl <marius@FreeBSD.org>
Date: Sat, 21 May 2005 20:15:14 +0000
Subject: [PATCH] For sparc64 conditionalize the compilation of the
 gfb_cursor() variant which doesn't assume a hardware cursor on __sparc64__
 rather than on DEV_CREATOR. If we want to include more than one framebuffer
 driver in e.g. the GENERIC kernel all drivers have to work the same way. Now
 that DEV_CREATOR is no longer used remove it from options.sparc64.

---
 sys/conf/options.sparc64    | 2 --
 sys/dev/syscons/scgfbrndr.c | 5 +----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/sys/conf/options.sparc64 b/sys/conf/options.sparc64
index 307ce702c36..3c7f9ffcd32 100644
--- a/sys/conf/options.sparc64
+++ b/sys/conf/options.sparc64
@@ -13,5 +13,3 @@ OFWCONS_POLL_HZ		opt_ofw.h
 # Debug IOMMU inserts/removes using diagnostic accesses. Very loud.
 IOMMU_DIAG		opt_iommu.h
 PMAP_STATS		opt_pmap.h
-
-DEV_CREATOR		opt_creator.h
diff --git a/sys/dev/syscons/scgfbrndr.c b/sys/dev/syscons/scgfbrndr.c
index cba157e0aca..e105d1d5f2d 100644
--- a/sys/dev/syscons/scgfbrndr.c
+++ b/sys/dev/syscons/scgfbrndr.c
@@ -31,9 +31,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_syscons.h"
 #include "opt_gfb.h"
-#ifdef __sparc64__
-#include "opt_creator.h"
-#endif
 #ifdef __powerpc__
 #include "opt_ofwfb.h"
 #endif
@@ -213,7 +210,7 @@ gfb_cursor_shape(scr_stat *scp, int base, int height, int blink)
 
 static int pxlblinkrate = 0;
 
-#if defined(DEV_CREATOR) || defined(SC_OFWFB)
+#if defined(__sparc64__) || defined(SC_OFWFB)
 static void
 gfb_cursor(scr_stat *scp, int at, int blink, int on, int flip)
 {