diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2013-08-28 07:03:03 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2013-08-28 07:03:03 +0000 |
| commit | 86d39fa0e938847162e2c96a172ce2ac79b62a57 (patch) | |
| tree | 8e05b55c75333160865c4dee5ee83c342e0a1245 /sys/arch | |
| parent | caf8e1b30bbb88042d3bceba0386f86921a3834c (diff) | |
Fix build, reported by jsg@
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/macppc/conf/files.macppc | 4 | ||||
| -rw-r--r-- | sys/arch/macppc/macppc/ofw_machdep.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/macppc/conf/files.macppc b/sys/arch/macppc/conf/files.macppc index c7981cbd6fd..f2563d233ae 100644 --- a/sys/arch/macppc/conf/files.macppc +++ b/sys/arch/macppc/conf/files.macppc @@ -1,4 +1,4 @@ -# $OpenBSD: files.macppc,v 1.75 2013/08/27 21:00:52 mpi Exp $ +# $OpenBSD: files.macppc,v 1.76 2013/08/28 07:03:02 mpi Exp $ # # macppc-specific configuration info @@ -256,7 +256,7 @@ include "dev/wsfont/files.wsfont" # VGA framebuffer device vgafb: wsemuldisplaydev, rasops8, rasops16, rasops32 attach vgafb at pci -file arch/macppc/pci/vgafb.c vgafb +file arch/macppc/pci/vgafb.c vgafb needs-flag # # CARDBUS diff --git a/sys/arch/macppc/macppc/ofw_machdep.c b/sys/arch/macppc/macppc/ofw_machdep.c index c1812b08e87..a152fd6f519 100644 --- a/sys/arch/macppc/macppc/ofw_machdep.c +++ b/sys/arch/macppc/macppc/ofw_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ofw_machdep.c,v 1.41 2013/08/27 21:00:52 mpi Exp $ */ +/* $OpenBSD: ofw_machdep.c,v 1.42 2013/08/28 07:03:02 mpi Exp $ */ /* $NetBSD: ofw_machdep.c,v 1.1 1996/09/30 16:34:50 ws Exp $ */ /* @@ -194,7 +194,7 @@ int cons_brightness; int cons_backlight_available; int fbnode; -#include "vgafb_pci.h" +#include "vgafb.h" struct usb_kbd_ihandles { struct usb_kbd_ihandles *next; @@ -412,7 +412,7 @@ of_display_console() #endif cons_membus->bus_base = 0x80000000; -#if NVGAFB_PCI > 0 +#if NVGAFB > 0 vgafb_cnattach(cons_membus, cons_membus, -1, 0); #endif |