From 14ebdf1554b6b89b3e8710a4c42ee85509ac858b Mon Sep 17 00:00:00 2001
From: miod <miod@openbsd.org>
Date: Mon, 11 Aug 2014 19:00:50 +0000
Subject: [PATCH] Do not extern octeon_boot_info, <machine/octeonvar.h>
 declares it for you.

---
 sys/arch/octeon/dev/cn30xxgmx.c     | 3 +--
 sys/arch/octeon/dev/if_cnmac.c      | 5 ++---
 sys/arch/octeon/dev/octcf.c         | 4 +---
 sys/arch/octeon/dev/octeon_pcibus.c | 3 +--
 sys/arch/octeon/dev/octrtc.c        | 4 +---
 5 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/sys/arch/octeon/dev/cn30xxgmx.c b/sys/arch/octeon/dev/cn30xxgmx.c
index 220bc32d1a4..3174222599a 100644
--- a/sys/arch/octeon/dev/cn30xxgmx.c
+++ b/sys/arch/octeon/dev/cn30xxgmx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cn30xxgmx.c,v 1.15 2014/08/11 18:52:54 miod Exp $	*/
+/*	$OpenBSD: cn30xxgmx.c,v 1.16 2014/08/11 19:00:50 miod Exp $	*/
 
 /*
  * Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -937,7 +937,6 @@ cn30xxgmx_rgmii_speed_speed(struct cn30xxgmx_port_softc *sc)
 int
 cn30xxgmx_rgmii_timing(struct cn30xxgmx_port_softc *sc)
 {
-	extern struct boot_info *octeon_boot_info;
 	int clk_tx_setting;
 	int clk_rx_setting;
 	uint64_t rx_frm_ctl;
diff --git a/sys/arch/octeon/dev/if_cnmac.c b/sys/arch/octeon/dev/if_cnmac.c
index 103db39e2dc..8499da50afa 100644
--- a/sys/arch/octeon/dev/if_cnmac.c
+++ b/sys/arch/octeon/dev/if_cnmac.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_cnmac.c,v 1.18 2014/08/11 18:56:49 miod Exp $	*/
+/*	$OpenBSD: if_cnmac.c,v 1.19 2014/08/11 19:00:50 miod Exp $	*/
 
 /*
  * Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -425,13 +425,12 @@ octeon_eth_smi_init(struct octeon_eth_softc *sc)
 void
 octeon_eth_board_mac_addr(uint8_t *enaddr)
 {
-	extern struct boot_info *octeon_boot_info;
 	int id;
 
 	/* Initialize MAC addresses from the global address base. */
 	if (octeon_eth_mac_addr == 0) {
 		memcpy((uint8_t *)&octeon_eth_mac_addr + 2,
-		       octeon_boot_info->mac_addr_base, 6);
+		    octeon_boot_info->mac_addr_base, 6);
 
 		/*
 		 * Should be allowed to fail hard if couldn't read the
diff --git a/sys/arch/octeon/dev/octcf.c b/sys/arch/octeon/dev/octcf.c
index cc842e28aae..c705eab4002 100644
--- a/sys/arch/octeon/dev/octcf.c
+++ b/sys/arch/octeon/dev/octcf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: octcf.c,v 1.24 2014/07/23 10:06:18 jasper Exp $ */
+/*	$OpenBSD: octcf.c,v 1.25 2014/08/11 19:00:50 miod Exp $ */
 /*	$NetBSD: wd.c,v 1.193 1999/02/28 17:15:27 explorer Exp $ */
 
 /*
@@ -160,8 +160,6 @@ int 	octcf_get_params(struct octcf_softc *, struct ataparams *);
 int
 octcfprobe(struct device *parent, void *match, void *aux)
 {
-	extern struct boot_info *octeon_boot_info;
-
 	if (octeon_boot_info->cf_common_addr == 0) {
 		OCTCFDEBUG_PRINT(("%s: No cf bus found\n", __func__), DEBUG_FUNCS | DEBUG_PROBE);
 		return 0;
diff --git a/sys/arch/octeon/dev/octeon_pcibus.c b/sys/arch/octeon/dev/octeon_pcibus.c
index 1ca37cb1651..6cbb86c4b0c 100644
--- a/sys/arch/octeon/dev/octeon_pcibus.c
+++ b/sys/arch/octeon/dev/octeon_pcibus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: octeon_pcibus.c,v 1.15 2014/07/12 18:44:42 tedu Exp $	*/
+/*	$OpenBSD: octeon_pcibus.c,v 1.16 2014/08/11 19:00:50 miod Exp $	*/
 /*	$NetBSD: bonito_mainbus.c,v 1.11 2008/04/28 20:23:10 martin Exp $	*/
 /*	$NetBSD: bonito_pci.c,v 1.5 2008/04/28 20:23:28 martin Exp $	*/
 
@@ -188,7 +188,6 @@ int
 octeon_pcibus_match(struct device *parent, void *vcf, void *aux)
 {
 	struct iobus_attach_args *aa = aux;
-	extern struct boot_info *octeon_boot_info;
 
 	if ((octeon_boot_info->config_flags & BOOTINFO_CFG_FLAG_PCI_HOST) == 0) {
 		OCTEON_PCIDEBUG(("%s, no PCI host function detected.\n", __func__));
diff --git a/sys/arch/octeon/dev/octrtc.c b/sys/arch/octeon/dev/octrtc.c
index 035b572b826..29922aa1e06 100644
--- a/sys/arch/octeon/dev/octrtc.c
+++ b/sys/arch/octeon/dev/octrtc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: octrtc.c,v 1.2 2014/05/07 14:44:54 pirofti Exp $	*/
+/*	$OpenBSD: octrtc.c,v 1.3 2014/08/11 19:00:50 miod Exp $	*/
 
 /*
  * Copyright (c) 2013, 2014 Paul Irofti.
@@ -81,8 +81,6 @@ octrtc_match(struct device *parent, void *match, void *aux)
 	struct mainbus_attach_args *maa = aux;
 	struct cfdata *cf = match;
 
-	extern struct boot_info *octeon_boot_info;
-
 	if (strcmp(maa->maa_name, cf->cf_driver->cd_name) != 0)
 		return 0;
 	/* No RTC on Ubiquiti */
-- 
2.20.1