8 files changed, 30 insertions, 30 deletions
diff --git a/sys/arch/mvme68k/include/atomic.h b/sys/arch/mvme68k/include/atomic.h
index d8f11efa428..acd3f628b99 100644
--- a/sys/arch/mvme68k/include/atomic.h
+++ b/sys/arch/mvme68k/include/atomic.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: atomic.h,v 1.2 2007/02/19 17:18:43 deraadt Exp $	*/
+/*	$OpenBSD: atomic.h,v 1.3 2011/03/23 16:54:36 pirofti Exp $	*/
 
 /* Public Domain */
 
-#ifndef __MVME68K_ATOMIC_H__
-#define __MVME68K_ATOMIC_H__
+#ifndef _MACHINE_ATOMIC_H_
+#define _MACHINE_ATOMIC_H_
 
 #include <m68k/atomic.h>
 
-#endif /* __MVME68K_ATOMIC_H__ */
+#endif /* _MACHINE_ATOMIC_H_ */
diff --git a/sys/arch/mvme68k/include/autoconf.h b/sys/arch/mvme68k/include/autoconf.h
index 429a6cfa7c7..585a56ab988 100644
--- a/sys/arch/mvme68k/include/autoconf.h
+++ b/sys/arch/mvme68k/include/autoconf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.h,v 1.17 2009/03/01 22:08:13 miod Exp $ */
+/*	$OpenBSD: autoconf.h,v 1.18 2011/03/23 16:54:36 pirofti Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -25,8 +25,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _MVME68K_AUTOCONF_H_
-#define _MVME68K_AUTOCONF_H_
+#ifndef _MACHINE_AUTOCONF_H_
+#define _MACHINE_AUTOCONF_H_
 
 #include <machine/bus.h>
 
diff --git a/sys/arch/mvme68k/include/bus.h b/sys/arch/mvme68k/include/bus.h
index 9d898749c4b..9e2d3e44229 100644
--- a/sys/arch/mvme68k/include/bus.h
+++ b/sys/arch/mvme68k/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.6 2009/07/30 21:39:54 miod Exp $	*/
+/*	$OpenBSD: bus.h,v 1.7 2011/03/23 16:54:36 pirofti Exp $	*/
 /*
  * Copyright (c) 2004, Miodrag Vallat.
  *
@@ -33,8 +33,8 @@
  * the management functions.
  */
 
-#ifndef	_MVME68K_BUS_H_
-#define	_MVME68K_BUS_H_
+#ifndef	_MACHINE_BUS_H_
+#define	_MACHINE_BUS_H_
 
 #include <sys/types.h>
 
@@ -797,4 +797,4 @@ void	bus_dmamem_unmap(bus_dma_tag_t tag, caddr_t kva,
 paddr_t bus_dmamem_mmap(bus_dma_tag_t tag, bus_dma_segment_t *segs,
 	    int nsegs, off_t off, int prot, int flags);
 
-#endif	/* _MVME68K_BUS_H_ */
+#endif	/* _MACHINE_BUS_H_ */
diff --git a/sys/arch/mvme68k/include/cpu.h b/sys/arch/mvme68k/include/cpu.h
index 492c7898cae..cb6f653fcfc 100644
--- a/sys/arch/mvme68k/include/cpu.h
+++ b/sys/arch/mvme68k/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.33 2010/07/24 12:18:58 miod Exp $ */
+/*	$OpenBSD: cpu.h,v 1.34 2011/03/23 16:54:36 pirofti Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -61,8 +61,8 @@
  *	@(#)cpu.h	8.4 (Berkeley) 1/5/94
  */
 
-#ifndef _MVME68K_CPU_H_
-#define _MVME68K_CPU_H_
+#ifndef _MACHINE_CPU_H_
+#define _MACHINE_CPU_H_
 
 /*
  * Exported definitions unique to mvme68k cpu support.
@@ -216,4 +216,4 @@ int intr_findvec(int, int);
 paddr_t kvtop(vaddr_t);
 
 #endif	/* _KERNEL */
-#endif	/* _MVME68K_CPU_H_ */
+#endif	/* _MACHINE_CPU_H_ */
diff --git a/sys/arch/mvme68k/include/disklabel.h b/sys/arch/mvme68k/include/disklabel.h
index 2815e417369..874fbed1317 100644
--- a/sys/arch/mvme68k/include/disklabel.h
+++ b/sys/arch/mvme68k/include/disklabel.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disklabel.h,v 1.11 2007/06/20 18:15:45 deraadt Exp $	*/
+/*	$OpenBSD: disklabel.h,v 1.12 2011/03/23 16:54:36 pirofti Exp $	*/
 
 /*
  * Copyright (c) 1996 Nivas Madhur
@@ -28,8 +28,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */  
 
-#ifndef _MVME68K_DISKLABEL_H_
-#define _MVME68K_DISKLABEL_H_
+#ifndef _MACHINE_DISKLABEL_H_
+#define _MACHINE_DISKLABEL_H_
 
 #define LABELSECTOR     0                       /* sector containing label */
 #define LABELOFFSET	0			/* offset of label in sector */
@@ -132,4 +132,4 @@ struct mvmedisklabel {
 	u_long		magic2;
 	u_char		cfg_4[192];
 };
-#endif	/* _MVME68K_DISKLABEL_H_ */
+#endif	/* _MACHINE_DISKLABEL_H_ */
diff --git a/sys/arch/mvme68k/include/intr.h b/sys/arch/mvme68k/include/intr.h
index 636df352576..309d87302ab 100644
--- a/sys/arch/mvme68k/include/intr.h
+++ b/sys/arch/mvme68k/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.20 2010/04/23 03:50:22 miod Exp $	*/
+/*	$OpenBSD: intr.h,v 1.21 2011/03/23 16:54:36 pirofti Exp $	*/
 /*
  * Copyright (C) 2000 Steve Murphree, Jr.
  * All rights reserved.
@@ -26,8 +26,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _MVME68K_INTR_H_
-#define _MVME68K_INTR_H_
+#ifndef _MACHINE_INTR_H_
+#define _MACHINE_INTR_H_
 
 #include <machine/psl.h>
 
@@ -75,4 +75,4 @@
 int	spl0(void);
 
 #endif /* _KERNEL */
-#endif /* _MVME68K_INTR_H_ */
+#endif /* _MACHINE_INTR_H_ */
diff --git a/sys/arch/mvme68k/include/nvram.h b/sys/arch/mvme68k/include/nvram.h
index 7a2e4c31d61..e1029bc0835 100644
--- a/sys/arch/mvme68k/include/nvram.h
+++ b/sys/arch/mvme68k/include/nvram.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nvram.h,v 1.5 2003/06/02 05:09:14 deraadt Exp $ */
+/*	$OpenBSD: nvram.h,v 1.6 2011/03/23 16:54:36 pirofti Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -25,8 +25,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef	_MVME68K_NVRAM_H_
-#define	_MVME68K_NVRAM_H_
+#ifndef	_MACHINE_NVRAM_H_
+#define	_MACHINE_NVRAM_H_
 
 struct nvram_147 {
 	u_char	user[0x400];
diff --git a/sys/arch/mvme68k/include/vmparam.h b/sys/arch/mvme68k/include/vmparam.h
index 8ece9d88b40..7f46c6a3144 100644
--- a/sys/arch/mvme68k/include/vmparam.h
+++ b/sys/arch/mvme68k/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmparam.h,v 1.16 2006/06/04 17:20:39 miod Exp $ */
+/*	$OpenBSD: vmparam.h,v 1.17 2011/03/23 16:54:36 pirofti Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -38,8 +38,8 @@
  *	@(#)vmparam.h	8.2 (Berkeley) 4/19/94
  */
 
-#ifndef _MVME68K_VMPARAM_H_
-#define _MVME68K_VMPARAM_H_
+#ifndef _MACHINE_VMPARAM_H_
+#define _MACHINE_VMPARAM_H_
 
 /*
  * Machine dependent constants for MVME68K
@@ -61,4 +61,4 @@
 #define	VM_PHYSSEG_MAX		1
 #define	VM_PHYSSEG_STRAT	VM_PSTRAT_RANDOM
 
-#endif /* _MVME68K_VMPARAM_H_ */
+#endif /* _MACHINE_VMPARAM_H_ */