Move function declaration where they belong.

2 files changed, 14 insertions, 18 deletions

diff --git a/sys/arch/macppc/pci/vgafb.c b/sys/arch/macppc/pci/vgafb.c
index 9824317aa8b..4d0c0e4f9ba 100644
--- a/sys/arch/macppc/pci/vgafb.c
+++ b/sys/arch/macppc/pci/vgafb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vgafb.c,v 1.44 2013/06/04 02:16:14 mpi Exp $	*/
+/*	$OpenBSD: vgafb.c,v 1.45 2013/06/04 02:20:18 mpi Exp $	*/
 /*	$NetBSD: vga.c,v 1.3 1996/12/02 22:24:54 cgd Exp $	*/
 
 /*
@@ -53,9 +53,16 @@ struct cfdriver vgafb_cd = {
 	NULL, "vgafb", DV_DULL,
 };
 
-void vgafb_setcolor(struct vga_config *vc, unsigned int index,
-		    u_int8_t r, u_int8_t g, u_int8_t b);
-void vgafb_restore_default_colors(struct vga_config *vc);
+int	vgafb_ioctl(void *, u_long, caddr_t, int, struct proc *);
+paddr_t	vgafb_mmap(void *, off_t, int);
+int	vgafb_alloc_screen(void *, const struct wsscreen_descr *, void **,
+	    int *, int *, long *);
+void	vgafb_free_screen(void *, void *);
+int	vgafb_show_screen(void *, void *, int, void (*cb)(void *, int, int),
+	    void *);
+void	vgafb_burn(void *v, u_int , u_int);
+void	vgafb_setcolor(struct vga_config *, u_int, uint8_t, uint8_t, uint8_t);
+void	vgafb_restore_default_colors(struct vga_config *);
 
 extern struct vga_config vgafbcn;
 
diff --git a/sys/arch/macppc/pci/vgafbvar.h b/sys/arch/macppc/pci/vgafbvar.h
index cad0db1076a..42b9773ec6d 100644
--- a/sys/arch/macppc/pci/vgafbvar.h
+++ b/sys/arch/macppc/pci/vgafbvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vgafbvar.h,v 1.17 2013/06/04 02:16:14 mpi Exp $	*/
+/*	$OpenBSD: vgafbvar.h,v 1.18 2013/06/04 02:20:18 mpi Exp $	*/
 /*	$NetBSD: vgavar.h,v 1.2 1996/11/23 06:06:43 cgd Exp $	*/
 
 /*
@@ -53,19 +53,8 @@ struct vga_config {
 	u_int vc_mode;
 };
 
+int	vgafb_cnattach(bus_space_tag_t, bus_space_tag_t, int, int);
+
 void	vgafb_init(bus_space_tag_t, bus_space_tag_t,
 	    struct vga_config *, u_int32_t, size_t);
-void	vgafb_wscons_attach(struct device *, struct vga_config *, int);
-void	vgafb_wscons_console(struct vga_config *);
-int	vgafb_cnattach(bus_space_tag_t, bus_space_tag_t, int, int);
 void	vgafb_wsdisplay_attach(struct device *, struct vga_config *, int);
-int	vgafbioctl(void *, u_long, caddr_t, int, struct proc *);
-paddr_t	vgafbmmap(void *, off_t, int);
-int	vgafb_ioctl(void *, u_long, caddr_t, int, struct proc *);
-paddr_t	vgafb_mmap(void *, off_t, int);
-int	vgafb_alloc_screen(void *v, const struct wsscreen_descr *type,
-	    void **cookiep, int *curxp, int *curyp, long *attrp);
-void	vgafb_free_screen(void *v, void *cookie);
-int	vgafb_show_screen(void *v, void *cookie, int waitok,
-	    void (*cb)(void *, int, int), void *cbarg);
-void	vgafb_burn(void *v, u_int on, u_int flags);