From 14219f5fb19ac50027cf3523a81be0a80b12ed1d Mon Sep 17 00:00:00 2001
From: miod <miod@openbsd.org>
Date: Mon, 18 Aug 2008 23:10:39 +0000
Subject: [PATCH] Some uglyness to allow both uba_common.h and ubareg.h to be
 included; temporary until they get merged for good (or split differently).

---
 sys/arch/vax/uba/uba_common.h | 3 ++-
 sys/arch/vax/uba/ubareg.h     | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/sys/arch/vax/uba/uba_common.h b/sys/arch/vax/uba/uba_common.h
index 46154e09822..0ee09891e58 100644
--- a/sys/arch/vax/uba/uba_common.h
+++ b/sys/arch/vax/uba/uba_common.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uba_common.h,v 1.4 2003/11/10 21:05:06 miod Exp $	*/
+/*	$OpenBSD: uba_common.h,v 1.5 2008/08/18 23:10:39 miod Exp $	*/
 /*	$NetBSD: uba_common.h,v 1.2 1999/06/21 16:23:01 ragge Exp $ */
 /*-
  * Copyright (c) 1982, 1986 The Regents of the University of California.
@@ -80,5 +80,6 @@ struct uba_regs {
 	pt_entry_t uba_map[UBAPAGES];	/* unibus map register */
 	int	pad3[UBAIOPAGES];	/* no maps for device address space */
 };
+#define	UBA_REGS_DEFINED
 
 void	uba_dma_init(struct uba_vsoftc *);
diff --git a/sys/arch/vax/uba/ubareg.h b/sys/arch/vax/uba/ubareg.h
index f7a9a0e3936..f225c6e9dc0 100644
--- a/sys/arch/vax/uba/ubareg.h
+++ b/sys/arch/vax/uba/ubareg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ubareg.h,v 1.11 2003/11/10 21:05:06 miod Exp $ */
+/*	$OpenBSD: ubareg.h,v 1.12 2008/08/18 23:10:39 miod Exp $ */
 /*	$NetBSD: ubareg.h,v 1.11 2000/01/24 02:40:36 matt Exp $ */
 
 /*-
@@ -84,7 +84,7 @@
 #define UBAIOADDR	0760000		/* start of I/O page */
 #define UBAIOPAGES	16
 
-#ifndef _LOCORE
+#if !defined(_LOCORE) && !defined(UBA_REGS_DEFINED)
 /*
  * DW780/DW750 hardware registers
  */
-- 
2.20.1