diff options
| author |   mpi <mpi@openbsd.org> | 2013-08-12 08:38:03 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2013-08-12 08:38:03 +0000 |
| commit | e0a9348d982d8e03cda046e93ae9a1aba4010d8a (patch) | |
| tree | 7c3aec69b3ba4e6d8847fac28778000d55fa075b | |
| parent | Match the framebuffer device against its OpenFirmware node in order (diff) | |
| download | wireguard-openbsd-e0a9348d982d8e03cda046e93ae9a1aba4010d8a.tar.xz wireguard-openbsd-e0a9348d982d8e03cda046e93ae9a1aba4010d8a.zip | |
radeondrm now attaches directly to pci.
| -rw-r--r-- | sys/arch/macppc/conf/files.macppc | 4 | ||||
| -rw-r--r-- | sys/arch/macppc/pci/vgafb_pci.c | 8 |
2 files changed, 3 insertions, 9 deletions
diff --git a/sys/arch/macppc/conf/files.macppc b/sys/arch/macppc/conf/files.macppc index a8010dae868..1c3ceb65df3 100644 --- a/sys/arch/macppc/conf/files.macppc +++ b/sys/arch/macppc/conf/files.macppc @@ -1,4 +1,4 @@ -# $OpenBSD: files.macppc,v 1.72 2013/08/12 04:11:52 jsg Exp $ +# $OpenBSD: files.macppc,v 1.73 2013/08/12 08:38:03 mpi Exp $ # # macppc-specific configuration info @@ -256,7 +256,7 @@ include "dev/rasops/files.rasops" include "dev/wsfont/files.wsfont" # VGA framebuffer -device vgafb: wsemuldisplaydev, rasops8, rasops16, rasops32, drmdev +device vgafb: wsemuldisplaydev, rasops8, rasops16, rasops32 file arch/macppc/pci/vgafb.c vgafb & vgafb_pci # Generic VGA Framebuffer version diff --git a/sys/arch/macppc/pci/vgafb_pci.c b/sys/arch/macppc/pci/vgafb_pci.c index a32a9d21080..5507e2a611e 100644 --- a/sys/arch/macppc/pci/vgafb_pci.c +++ b/sys/arch/macppc/pci/vgafb_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vgafb_pci.c,v 1.32 2013/08/12 08:03:56 mpi Exp $ */ +/* $OpenBSD: vgafb_pci.c,v 1.33 2013/08/12 08:38:03 mpi Exp $ */ /* $NetBSD: vga_pci.c,v 1.4 1996/12/05 01:39:38 cgd Exp $ */ /* @@ -41,8 +41,6 @@ #include <dev/wscons/wsdisplayvar.h> #include <dev/rasops/rasops.h> -#include "drm.h" - #include <arch/macppc/pci/vgafbvar.h> #include <dev/pci/vga_pcivar.h> @@ -214,8 +212,4 @@ vgafb_pci_attach(struct device *parent, struct device *self, void *aux) pci_conf_write(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG, reg); vgafb_wsdisplay_attach(self, vc, console); - -#if NDRM > 0 - config_found_sm(self, aux, NULL, drmsubmatch); -#endif } |