summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@openbsd.org>2013-07-06 23:51:21 +0200
committerJonathan Gray <jsg@jsg.id.au>2013-08-12 10:44:49 +1000
commit722d33806bd98521f8d3b4878dfbd6e938c3ce75 (patch)
tree56100c161b780888fa941e6e89ca90e7f0a81e1b /sys/dev
parent792ee3dc907258c20cfcb595b02a07c7d2b8c1e0 (diff)
rename drmsubmatch to vga_drmsubmatch
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/vga_pci.c2
-rw-r--r--sys/dev/pci/vga_pci_common.c2
-rw-r--r--sys/dev/pci/vga_pcivar.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/pci/vga_pci.c b/sys/dev/pci/vga_pci.c
index 4fce91541f6..2257a73c575 100644
--- a/sys/dev/pci/vga_pci.c
+++ b/sys/dev/pci/vga_pci.c
@@ -273,7 +273,7 @@ vga_pci_attach(struct device *parent, struct device *self, void *aux)
#endif
#if NDRM > 0
- config_found_sm(self, aux, NULL, drmsubmatch);
+ config_found_sm(self, aux, NULL, vga_drmsubmatch);
#endif
sc->sc_vc = vga_common_attach(self, pa->pa_iot, pa->pa_memt,
diff --git a/sys/dev/pci/vga_pci_common.c b/sys/dev/pci/vga_pci_common.c
index 05cd157132e..bf692827133 100644
--- a/sys/dev/pci/vga_pci_common.c
+++ b/sys/dev/pci/vga_pci_common.c
@@ -29,7 +29,7 @@
#if NDRM > 0
int
-drmsubmatch(struct device *parent, void *match, void *aux)
+vga_drmsubmatch(struct device *parent, void *match, void *aux)
{
struct cfdata *cf = match;
struct cfdriver *cd;
diff --git a/sys/dev/pci/vga_pcivar.h b/sys/dev/pci/vga_pcivar.h
index ed3ec62b7b0..976b22499f2 100644
--- a/sys/dev/pci/vga_pcivar.h
+++ b/sys/dev/pci/vga_pcivar.h
@@ -92,7 +92,7 @@ struct vga_pci_bar *vga_pci_bar_map(struct vga_pci_softc *, int,
void vga_pci_bar_unmap(struct vga_pci_bar*);
#if NDRM > 0
-int drmsubmatch(struct device *, void *, void *);
+int vga_drmsubmatch(struct device *, void *, void *);
#endif
#ifdef VESAFB