summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authormartin <martin@NetBSD.org>2006-05-28 08:57:53 +0000
committermartin <martin@NetBSD.org>2006-05-28 08:57:53 +0000
commitb59e36a0737d075aa5399d38facd6e51ebf91654 (patch)
tree59787a27121064cd88d2812770f9b8bd58bbeb16 /sys/dev
parent07ddfaead37bb07fd373577c11395af944d2e349 (diff)
Move definition of the 'fb' attribute to global scope and make machfb@pci
require it. On most archs this does not change anything, but on sparc{,64} it allows linking of kernels that have machfb as the only framebuffer. Solution suggested by Quentin.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/files.pci4
-rw-r--r--sys/dev/sun/files.sun4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/pci/files.pci b/sys/dev/pci/files.pci
index dd561e13af3..6fb313de9ac 100644
--- a/sys/dev/pci/files.pci
+++ b/sys/dev/pci/files.pci
@@ -1,4 +1,4 @@
-# $NetBSD: files.pci,v 1.254 2006/05/24 23:44:28 wrstuden Exp $
+# $NetBSD: files.pci,v 1.255 2006/05/28 08:57:53 martin Exp $
#
# Config file and device description for machine-independent PCI code.
# Included by ports that need it. Requires that the SCSI files be
@@ -743,7 +743,7 @@ attach joy at pci with joy_pci
file dev/pci/joy_pci.c joy_pci
# ATI Mach64 framebuffer console driver
-device machfb: wsemuldisplaydev, rasops8, vcons, videomode
+device machfb: wsemuldisplaydev, rasops8, fb, vcons, videomode
attach machfb at pci
file dev/pci/machfb.c machfb
diff --git a/sys/dev/sun/files.sun b/sys/dev/sun/files.sun
index d00269e869c..8e029752517 100644
--- a/sys/dev/sun/files.sun
+++ b/sys/dev/sun/files.sun
@@ -1,4 +1,4 @@
-# $NetBSD: files.sun,v 1.10 2005/12/11 12:23:56 christos Exp $
+# $NetBSD: files.sun,v 1.11 2006/05/28 08:57:53 martin Exp $
#
# Configuration file for devices found on Sun machines.
#
@@ -64,7 +64,7 @@ define bt_dac
file dev/sun/bt_subr.c bt_dac
# Include /dev/fb driver only if a framebuffer card is included
-define fb
+# The attribute "fb" is already defined in src/sys/conf/files
file dev/sun/fb.c fb needs-flag
# pfour `add-on'; used by several drivers